diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanDestroy.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanDestroy.java index 99dcf160..e69619f3 100644 --- a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanDestroy.java +++ b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanDestroy.java @@ -8,12 +8,12 @@ public class NbtCheck_CanDestroy extends NbtCheck { public NbtCheck_CanDestroy() { - super("CanDestroy", PStrictness.AVERAGE); + super("CanDestroy", PStrictness.STRICT); } @Override public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolConstants protocolConstants, PConfig config) { - return true; + return false; } } diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanPlaceOn.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanPlaceOn.java index 7fd8f439..5f5359e8 100644 --- a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanPlaceOn.java +++ b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanPlaceOn.java @@ -8,12 +8,12 @@ public class NbtCheck_CanPlaceOn extends NbtCheck { public NbtCheck_CanPlaceOn() { - super("CanPlaceOn", PStrictness.AVERAGE); + super("CanPlaceOn", PStrictness.STRICT); } @Override public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolConstants protocolConstants, PConfig config) { - return true; + return false; } } diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_ench.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_ench.java index 40693abe..1b1226c9 100644 --- a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_ench.java +++ b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_ench.java @@ -37,7 +37,9 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons INbtTagCompound enchantment = enchantments.get(i); Enchantment bukkitEnchantment = getEnchantment(enchantment); - if (bukkitEnchantment == null) return true; + if (bukkitEnchantment == null) { + continue; + } int lvl = 0xFFFF & enchantments.get(i).getShort("lvl"); @@ -64,7 +66,7 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons } private static Enchantment getEnchantment(INbtTagCompound enchantment) { - if (enchantment.hasKeyOfType("id", NbtDataType.INT)) { + if (enchantment.hasKeyOfType("id", NbtDataType.INT) || enchantment.hasKeyOfType("id", NbtDataType.SHORT)) { final int id = enchantment.getInt("id"); try { diff --git a/plugin/pom.xml b/plugin/pom.xml index a077aa11..d1424504 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -27,19 +27,19 @@ com.ruinscraft panilla-api - 0.0.1-SNAPSHOT + 1.0 compile com.ruinscraft panilla-v1_12_R1 - 0.0.1-SNAPSHOT + 1.0 compile com.ruinscraft panilla-v1_13_R2 - 0.0.1-SNAPSHOT + 1.0 compile diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml index 05697620..7bf4d0e2 100644 --- a/v1_12_R1/pom.xml +++ b/v1_12_R1/pom.xml @@ -28,7 +28,7 @@ com.ruinscraft panilla-api - 0.0.1-SNAPSHOT + 1.0 provided diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml index 0f364450..daf9b3ed 100644 --- a/v1_13_R2/pom.xml +++ b/v1_13_R2/pom.xml @@ -28,7 +28,7 @@ com.ruinscraft panilla-api - 0.0.1-SNAPSHOT + 1.0 provided