Fix Villager trades not being blocked

CitizensDev · Mar 1, 2016 · 7ad5f73 · 7ad5f73
1 parent bdd82ce
commit 7ad5f73
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java
@@ -196,8 +196,9 @@ protected void L() {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override

diff --git a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java
@@ -174,8 +174,9 @@ protected void L() {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override

diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigController.java b/src/main/java/net/citizensnpcs/npc/entity/PigController.java
@@ -187,8 +187,9 @@ protected void L() {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override

diff --git a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java
@@ -18,7 +18,9 @@
 import net.minecraft.server.v1_9_R1.BlockPosition;
 import net.minecraft.server.v1_9_R1.EntityHuman;
 import net.minecraft.server.v1_9_R1.EntityVillager;
+import net.minecraft.server.v1_9_R1.EnumHand;
 import net.minecraft.server.v1_9_R1.IBlockData;
+import net.minecraft.server.v1_9_R1.ItemStack;
 import net.minecraft.server.v1_9_R1.MinecraftKey;
 import net.minecraft.server.v1_9_R1.NBTTagCompound;
 import net.minecraft.server.v1_9_R1.SoundEffect;
@@ -69,7 +71,7 @@ protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockp
         }
 
         @Override
-        public boolean a(EntityHuman entityhuman) {
+        public boolean a(EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack) {
             return npc == null || !blockTrades ? super.a(entityhuman) : false; // block
             // trades
         }