fix nested EntityTag item checks, bump version

ds58 · Mar 21, 2019 · 7b09bfa · 7b09bfa
1 parent 8734ee8
commit 7b09bfa
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.ruinscraft</groupId>
 		<artifactId>panilla</artifactId>
-		<version>1.0</version>
+		<version>1.1</version>
 	</parent>
 
 	<artifactId>panilla-api</artifactId>

diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_EntityTag.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_EntityTag.java
@@ -36,13 +36,17 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons
 		if (entityTag.hasKey("ArmorItems")) {
 			INbtTagList items = entityTag.getList("ArmorItems", NbtDataType.COMPOUND);
 
-			checkItems(items, nmsItemClassName, protocolConstants, config);
+			if (!checkItems(items, nmsItemClassName, protocolConstants, config)) {
+				return false;
+			}
 		}
 
 		if (entityTag.hasKey("HandItems")) {
 			INbtTagList items = entityTag.getList("HandItems", NbtDataType.COMPOUND);
 
-			checkItems(items, nmsItemClassName, protocolConstants, config);
+			if (!checkItems(items, nmsItemClassName, protocolConstants, config)) {
+				return false;
+			}
 		}
 
 		return true;

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.ruinscraft</groupId>
 		<artifactId>panilla</artifactId>
-		<version>1.0</version>
+		<version>1.1</version>
 	</parent>
 
 	<artifactId>panilla-plugin</artifactId>
@@ -27,19 +27,19 @@
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-api</artifactId>
-			<version>1.0</version>
+			<version>1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-v1_12_R1</artifactId>
-			<version>1.0</version>
+			<version>1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-v1_13_R2</artifactId>
-			<version>1.0</version>
+			<version>1.1</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.ruinscraft</groupId>
 	<artifactId>panilla</artifactId>
-	<version>1.0</version>
+	<version>1.1</version>
 	<packaging>pom</packaging>
 
 	<modules>

diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.ruinscraft</groupId>
 		<artifactId>panilla</artifactId>
-		<version>1.0</version>
+		<version>1.1</version>
 	</parent>
 
 	<artifactId>panilla-v1_12_R1</artifactId>
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-api</artifactId>
-			<version>1.0</version>
+			<version>1.1</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.ruinscraft</groupId>
 		<artifactId>panilla</artifactId>
-		<version>1.0</version>
+		<version>1.1</version>
 	</parent>
 
 	<artifactId>panilla-v1_13_R2</artifactId>
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-api</artifactId>
-			<version>1.0</version>
+			<version>1.1</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>