diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java index ad32f0c55..a12e47656 100644 --- a/src/main/java/net/citizensnpcs/Citizens.java +++ b/src/main/java/net/citizensnpcs/Citizens.java @@ -430,5 +430,5 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { return false; } - private static final String COMPATIBLE_MC_VERSION = "1.6.2"; + private static final String COMPATIBLE_MC_VERSION = "1.6.4"; } diff --git a/src/main/java/net/citizensnpcs/editor/SheepEquipper.java b/src/main/java/net/citizensnpcs/editor/SheepEquipper.java index c52038327..71121d7c4 100644 --- a/src/main/java/net/citizensnpcs/editor/SheepEquipper.java +++ b/src/main/java/net/citizensnpcs/editor/SheepEquipper.java @@ -11,6 +11,7 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.entity.Sheep; import org.bukkit.inventory.ItemStack; +import org.bukkit.material.Dye; public class SheepEquipper implements Equipper { @Override @@ -21,10 +22,10 @@ public class SheepEquipper implements Equipper { Messaging.sendTr(equipper, toEquip.getTrait(Sheared.class).toggle() ? Messages.SHEARED_SET : Messages.SHEARED_STOPPED, toEquip.getName()); } else if (hand.getType() == Material.INK_SACK) { - if (sheep.getColor() == DyeColor.getByWoolData((byte) (15 - hand.getData().getData()))) + Dye dye = (Dye) hand.getData(); + if (sheep.getColor() == dye.getColor()) return; - - DyeColor color = DyeColor.getByWoolData((byte) (15 - hand.getData().getData())); + DyeColor color = dye.getColor(); toEquip.getTrait(WoolColor.class).setColor(color); Messaging.sendTr(equipper, Messages.EQUIPMENT_EDITOR_SHEEP_COLOURED, toEquip.getName(), color.name() .toLowerCase().replace("_", " ")); diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java index 512c3a0b8..62ed3827a 100644 --- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java +++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java @@ -20,11 +20,11 @@ import net.citizensnpcs.trait.CurrentLocation; import net.citizensnpcs.util.Messages; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityLiving; +import net.minecraft.server.v1_6_R3.EntityLiving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/net/citizensnpcs/npc/MobEntityController.java b/src/main/java/net/citizensnpcs/npc/MobEntityController.java index ec2f735b5..59364ef02 100644 --- a/src/main/java/net/citizensnpcs/npc/MobEntityController.java +++ b/src/main/java/net/citizensnpcs/npc/MobEntityController.java @@ -5,12 +5,12 @@ import java.util.Map; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Location; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_6_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R3.CraftWorld; import org.bukkit.entity.LivingEntity; import com.google.common.collect.Maps; diff --git a/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java index ef720604c..471233b04 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java @@ -10,7 +10,7 @@ import net.citizensnpcs.api.astar.pathfinder.VectorGoal; import net.citizensnpcs.api.astar.pathfinder.VectorNode; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_6_R2.EntityLiving; +import net.minecraft.server.v1_6_R3.EntityLiving; import org.bukkit.Location; import org.bukkit.util.Vector; diff --git a/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java b/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java index 24b097b4a..1054170d7 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java +++ b/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java @@ -3,17 +3,17 @@ package net.citizensnpcs.npc.ai; import net.citizensnpcs.api.ai.tree.BehaviorGoalAdapter; import net.citizensnpcs.api.ai.tree.BehaviorStatus; import net.citizensnpcs.util.PlayerAnimation; -import net.minecraft.server.v1_6_R2.Block; -import net.minecraft.server.v1_6_R2.Enchantment; -import net.minecraft.server.v1_6_R2.EnchantmentManager; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.ItemStack; -import net.minecraft.server.v1_6_R2.Material; -import net.minecraft.server.v1_6_R2.MobEffectList; +import net.minecraft.server.v1_6_R3.Block; +import net.minecraft.server.v1_6_R3.Enchantment; +import net.minecraft.server.v1_6_R3.EnchantmentManager; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.ItemStack; +import net.minecraft.server.v1_6_R3.Material; +import net.minecraft.server.v1_6_R3.MobEffectList; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -39,7 +39,7 @@ public class BlockBreaker extends BehaviorGoalAdapter { return Math.pow(entity.locX - x, 2) + Math.pow(entity.locY - y, 2) + Math.pow(entity.locZ - z, 2); } - private net.minecraft.server.v1_6_R2.ItemStack getCurrentItem() { + private net.minecraft.server.v1_6_R3.ItemStack getCurrentItem() { return configuration.item() != null ? CraftItemStack.asNMSCopy(configuration.item()) : entity.getEquipment(0); } @@ -174,8 +174,6 @@ public class BlockBreaker extends BehaviorGoalAdapter { } } - private static final Configuration EMPTY = new Configuration(); - public static BlockBreaker create(LivingEntity entity, org.bukkit.block.Block target) { return createWithConfiguration(entity, target, EMPTY); } @@ -184,4 +182,6 @@ public class BlockBreaker extends BehaviorGoalAdapter { Configuration config) { return new BlockBreaker(entity, target, config); } + + private static final Configuration EMPTY = new Configuration(); } \ No newline at end of file diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java index 34bb2b5dd..d3493bf71 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java @@ -5,11 +5,11 @@ import net.citizensnpcs.api.ai.TargetType; import net.citizensnpcs.api.ai.event.CancelReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.Navigation; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.Navigation; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity; public class MCNavigationStrategy extends AbstractPathStrategy { private final Navigation navigation; diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java index 28b146da8..9fededce8 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java @@ -12,16 +12,16 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.PlayerAnimation; import net.citizensnpcs.util.nms.PlayerNavigation; -import net.minecraft.server.v1_6_R2.AttributeInstance; -import net.minecraft.server.v1_6_R2.Entity; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.Navigation; -import net.minecraft.server.v1_6_R2.PathEntity; +import net.minecraft.server.v1_6_R3.AttributeInstance; +import net.minecraft.server.v1_6_R3.Entity; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.Navigation; +import net.minecraft.server.v1_6_R3.PathEntity; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity; import org.bukkit.entity.LivingEntity; public class MCTargetStrategy implements PathStrategy, EntityTarget { diff --git a/src/main/java/net/citizensnpcs/npc/entity/BatController.java b/src/main/java/net/citizensnpcs/npc/entity/BatController.java index 7974043ef..500c3ffce 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BatController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BatController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityBat; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityBat; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftBat; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftBat; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.entity.Bat; import org.bukkit.util.Vector; @@ -57,16 +57,6 @@ public class BatController extends MobEntityController { } } - @Override - public void bh() { - if (npc == null) - super.bh(); - else { - NMS.updateAI(this); - npc.update(); - } - } - @Override public boolean bH() { if (npc == null) { @@ -76,13 +66,23 @@ public class BatController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void bi() { + if (npc == null) { + super.bi(); + } else { + NMS.updateAI(this); + npc.update(); + } + } + + @Override + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -127,8 +127,9 @@ public class BatController extends MobEntityController { @Override public void l_() { super.l_(); - if (npc != null) + if (npc != null) { npc.update(); + } } public void setFlying(boolean flying) { diff --git a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java index d98c030a4..cadcc42ac 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityBlaze; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityBlaze; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftBlaze; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.entity.Blaze; import org.bukkit.util.Vector; @@ -64,23 +64,23 @@ public class BlazeController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc != null) { NMS.updateAI(this); npc.update(); } else { - super.bk(); + super.bl(); } } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java index b9385b4ea..c351391ae 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityCaveSpider; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityCaveSpider; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftCaveSpider; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.entity.CaveSpider; import org.bukkit.util.Vector; @@ -57,13 +57,6 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void bh() { - super.bh(); - if (npc != null) - npc.update(); - } - @Override public boolean bH() { if (npc == null) @@ -72,15 +65,22 @@ public class CaveSpiderController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bi() { + super.bi(); + if (npc != null) + npc.update(); + } + + @Override + public void bl() { if (npc == null) - super.bk(); + super.bl(); else { NMS.updateAI(this); npc.update(); @@ -88,7 +88,7 @@ public class CaveSpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java index d559c6630..590a98e0b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityChicken; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityChicken; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftChicken; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.entity.Chicken; import org.bukkit.util.Vector; @@ -57,8 +57,8 @@ public class ChickenController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -71,13 +71,13 @@ public class ChickenController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CowController.java b/src/main/java/net/citizensnpcs/npc/entity/CowController.java index f369076f2..f5a946e09 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CowController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityCow; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityCow; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftCow; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftCow; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.entity.Cow; import org.bukkit.util.Vector; @@ -58,8 +58,8 @@ public class CowController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -72,13 +72,13 @@ public class CowController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java index 5d39c42ec..f33e8db9c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java @@ -7,14 +7,14 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityCreeper; -import net.minecraft.server.v1_6_R2.EntityLightning; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityCreeper; +import net.minecraft.server.v1_6_R3.EntityLightning; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftCreeper; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.entity.Creeper; import org.bukkit.util.Vector; @@ -65,8 +65,8 @@ public class CreeperController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) { npc.update(); } @@ -80,13 +80,13 @@ public class CreeperController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java index 37d96bded..109ac1053 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityEnderDragon; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityEnderDragon; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEnderDragon; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.entity.EnderDragon; import org.bukkit.util.Vector; @@ -64,15 +64,15 @@ public class EnderDragonController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc == null) { - super.bk(); + super.bl(); } } @@ -92,7 +92,7 @@ public class EnderDragonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java index 93aedce45..d08d14d54 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityEnderman; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityEnderman; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEnderman; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; import org.bukkit.entity.Enderman; import org.bukkit.util.Vector; @@ -57,13 +57,6 @@ public class EndermanController extends MobEntityController { } } - @Override - public void bh() { - super.bh(); - if (npc != null) - npc.update(); - } - @Override public boolean bH() { if (npc == null) @@ -72,15 +65,22 @@ public class EndermanController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bi() { + super.bi(); + if (npc != null) + npc.update(); + } + + @Override + public void bl() { if (npc == null) - super.bk(); + super.bl(); else { NMS.updateAI(this); npc.update(); @@ -98,7 +98,7 @@ public class EndermanController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -152,12 +152,12 @@ public class EndermanController extends MobEntityController { NMS.updateAI(this); // taken from EntityLiving update method if (bd) { - /* boolean inLiquid = G() || I(); + /* boolean inLiquid = H() || J(); if (inLiquid) { motY += 0.04; } else //(handled elsewhere)*/ if (onGround && jumpTicks == 0) { - bd(); + be(); jumpTicks = 10; } } else { diff --git a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java index 5591bb431..3d4ef2385 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java @@ -18,28 +18,28 @@ import net.citizensnpcs.util.nms.PlayerControllerJump; import net.citizensnpcs.util.nms.PlayerControllerLook; import net.citizensnpcs.util.nms.PlayerControllerMove; import net.citizensnpcs.util.nms.PlayerNavigation; -import net.minecraft.server.v1_6_R2.AttributeInstance; -import net.minecraft.server.v1_6_R2.Connection; -import net.minecraft.server.v1_6_R2.Entity; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.EnumGamemode; -import net.minecraft.server.v1_6_R2.GenericAttributes; -import net.minecraft.server.v1_6_R2.MathHelper; -import net.minecraft.server.v1_6_R2.MinecraftServer; -import net.minecraft.server.v1_6_R2.Navigation; -import net.minecraft.server.v1_6_R2.NetworkManager; -import net.minecraft.server.v1_6_R2.Packet; -import net.minecraft.server.v1_6_R2.Packet201PlayerInfo; -import net.minecraft.server.v1_6_R2.Packet34EntityTeleport; -import net.minecraft.server.v1_6_R2.Packet35EntityHeadRotation; -import net.minecraft.server.v1_6_R2.Packet5EntityEquipment; -import net.minecraft.server.v1_6_R2.PlayerInteractManager; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.AttributeInstance; +import net.minecraft.server.v1_6_R3.Connection; +import net.minecraft.server.v1_6_R3.Entity; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.EnumGamemode; +import net.minecraft.server.v1_6_R3.GenericAttributes; +import net.minecraft.server.v1_6_R3.MathHelper; +import net.minecraft.server.v1_6_R3.MinecraftServer; +import net.minecraft.server.v1_6_R3.Navigation; +import net.minecraft.server.v1_6_R3.NetworkManager; +import net.minecraft.server.v1_6_R3.Packet; +import net.minecraft.server.v1_6_R3.Packet201PlayerInfo; +import net.minecraft.server.v1_6_R3.Packet34EntityTeleport; +import net.minecraft.server.v1_6_R3.Packet35EntityHeadRotation; +import net.minecraft.server.v1_6_R3.Packet5EntityEquipment; +import net.minecraft.server.v1_6_R3.PlayerInteractManager; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; import org.bukkit.util.Vector; @@ -68,7 +68,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -145,7 +145,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { } AttributeInstance range = this.getAttributeInstance(GenericAttributes.b); if (range == null) { - range = this.aW().b(GenericAttributes.b); + range = this.aX().b(GenericAttributes.b); } range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble()); controllerJump = new PlayerControllerJump(this); @@ -197,12 +197,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { NMS.updateAI(this); // taken from EntityLiving update method if (bd) { - /* boolean inLiquid = G() || I(); + /* boolean inLiquid = H() || J(); if (inLiquid) { motY += 0.04; } else //(handled elsewhere)*/ if (onGround && jumpTicks == 0) { - bd(); + be(); jumpTicks = 10; } } else { diff --git a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java index 338844375..8ed95dad6 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityGhast; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityGhast; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftGhast; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftGhast; import org.bukkit.entity.Ghast; import org.bukkit.util.Vector; @@ -50,21 +50,21 @@ public class GhastController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc != null) { npc.update(); } else - super.bk(); + super.bl(); } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java index 264d8a482..60eaf3784 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityGiantZombie; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityGiantZombie; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftGiant; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftGiant; import org.bukkit.entity.Giant; import org.bukkit.util.Vector; @@ -50,15 +50,15 @@ public class GiantController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc == null) { - super.bk(); + super.bl(); } else { NMS.updateAI(this); npc.update(); @@ -66,7 +66,7 @@ public class GiantController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/HorseController.java b/src/main/java/net/citizensnpcs/npc/entity/HorseController.java index 48eb808ac..aaf569a84 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/HorseController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/HorseController.java @@ -8,14 +8,14 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityHorse; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityHorse; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftHorse; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftHorse; import org.bukkit.entity.Horse; import org.bukkit.util.Vector; @@ -60,7 +60,7 @@ public class HorseController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @@ -77,7 +77,7 @@ public class HorseController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -124,12 +124,12 @@ public class HorseController extends MobEntityController { NMS.updateAI(this); // taken from EntityLiving update method if (bd) { - /* boolean inLiquid = G() || I(); + /* boolean inLiquid = H() || J(); if (inLiquid) { motY += 0.04; } else //(handled elsewhere)*/ if (onGround && jumpTicks == 0) { - bd(); + be(); jumpTicks = 10; } } else { diff --git a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java index fa3785c73..49cbe0cd9 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java @@ -6,12 +6,12 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.Colorizer; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_6_R2.PlayerInteractManager; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.PlayerInteractManager; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_6_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R3.CraftWorld; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java index ed93c55c4..74533856b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityIronGolem; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityIronGolem; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftIronGolem; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftIronGolem; import org.bukkit.entity.IronGolem; import org.bukkit.util.Vector; @@ -43,8 +43,8 @@ public class IronGolemController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -57,13 +57,13 @@ public class IronGolemController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java index a79d335ee..3c1209e8b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityMagmaCube; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityMagmaCube; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftMagmaCube; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftMagmaCube; import org.bukkit.entity.MagmaCube; import org.bukkit.util.Vector; @@ -44,8 +44,8 @@ public class MagmaCubeController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -58,15 +58,15 @@ public class MagmaCubeController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc == null) - super.bk(); + super.bl(); else { NMS.updateAI(this); npc.update(); @@ -74,7 +74,7 @@ public class MagmaCubeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java index 9ed38e8fe..b7c8b5570 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityMushroomCow; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityMushroomCow; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftMushroomCow; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftMushroomCow; import org.bukkit.entity.MushroomCow; import org.bukkit.util.Vector; @@ -44,8 +44,8 @@ public class MushroomCowController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -58,13 +58,13 @@ public class MushroomCowController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java index a71784344..a28cdc4ad 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityOcelot; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityOcelot; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftOcelot; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftOcelot; import org.bukkit.entity.Ocelot; import org.bukkit.util.Vector; @@ -44,8 +44,8 @@ public class OcelotController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -58,13 +58,13 @@ public class OcelotController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigController.java b/src/main/java/net/citizensnpcs/npc/entity/PigController.java index b37e8a5c1..2b828a5ad 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigController.java @@ -7,14 +7,14 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityLightning; -import net.minecraft.server.v1_6_R2.EntityPig; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityLightning; +import net.minecraft.server.v1_6_R3.EntityPig; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPig; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPig; import org.bukkit.entity.Pig; import org.bukkit.util.Vector; @@ -50,8 +50,8 @@ public class PigController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -64,13 +64,13 @@ public class PigController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java index 36c171df1..75b221b49 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityPigZombie; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityPigZombie; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPigZombie; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPigZombie; import org.bukkit.entity.PigZombie; import org.bukkit.util.Vector; @@ -44,8 +44,8 @@ public class PigZombieController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -58,15 +58,15 @@ public class PigZombieController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc == null) { - super.bk(); + super.bl(); } else { NMS.updateAI(this); npc.update(); @@ -74,7 +74,7 @@ public class PigZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java index ad1eb9bc7..e092ec5e3 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntitySheep; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntitySheep; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftSheep; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftSheep; import org.bukkit.entity.Sheep; import org.bukkit.util.Vector; @@ -44,8 +44,8 @@ public class SheepController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -58,13 +58,13 @@ public class SheepController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java index 486339724..e159d6760 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntitySilverfish; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntitySilverfish; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftSilverfish; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftSilverfish; import org.bukkit.entity.Silverfish; import org.bukkit.util.Vector; @@ -43,8 +43,8 @@ public class SilverfishController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -57,15 +57,15 @@ public class SilverfishController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc == null) { - super.bk(); + super.bl(); } else { NMS.updateAI(this); npc.update(); @@ -73,7 +73,7 @@ public class SilverfishController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java index ce66a1663..6b93ceb74 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntitySkeleton; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntitySkeleton; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftSkeleton; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftSkeleton; import org.bukkit.entity.Skeleton; import org.bukkit.util.Vector; @@ -43,8 +43,8 @@ public class SkeletonController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -57,13 +57,13 @@ public class SkeletonController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java index b6c3c4e0f..cd124f64e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntitySlime; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntitySlime; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftSlime; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftSlime; import org.bukkit.entity.Slime; import org.bukkit.util.Vector; @@ -45,8 +45,8 @@ public class SlimeController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -59,15 +59,15 @@ public class SlimeController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc == null) { - super.bk(); + super.bl(); } else { npc.update(); NMS.updateAI(this); @@ -75,7 +75,7 @@ public class SlimeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java index 910f3f327..fe5e2eabb 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntitySnowman; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntitySnowman; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftSnowman; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftSnowman; import org.bukkit.entity.Snowman; import org.bukkit.util.Vector; @@ -43,8 +43,8 @@ public class SnowmanController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -57,13 +57,13 @@ public class SnowmanController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java index de5a6023c..34390ff42 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntitySpider; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntitySpider; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftSpider; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftSpider; import org.bukkit.entity.Spider; import org.bukkit.util.Vector; @@ -43,8 +43,8 @@ public class SpiderController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -57,15 +57,15 @@ public class SpiderController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc == null) - super.bk(); + super.bl(); else { NMS.updateAI(this); npc.update(); @@ -73,7 +73,7 @@ public class SpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java index 536adc1ee..4ed5ef96c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntitySquid; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntitySquid; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftSquid; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftSquid; import org.bukkit.entity.Squid; import org.bukkit.util.Vector; @@ -50,21 +50,21 @@ public class SquidController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void bk() { + public void bl() { if (npc != null) { npc.update(); } else - super.bk(); + super.bl(); } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java index 1093e3853..71588842e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java @@ -7,14 +7,14 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityHuman; -import net.minecraft.server.v1_6_R2.EntityVillager; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityHuman; +import net.minecraft.server.v1_6_R3.EntityVillager; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftVillager; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftVillager; import org.bukkit.entity.Villager; import org.bukkit.util.Vector; @@ -51,8 +51,8 @@ public class VillagerController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -65,13 +65,13 @@ public class VillagerController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java index 2e6a9a0ea..d0cd0aafa 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityWitch; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityWitch; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftWitch; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftWitch; import org.bukkit.entity.Witch; import org.bukkit.util.Vector; @@ -43,8 +43,8 @@ public class WitchController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) npc.update(); } @@ -57,13 +57,13 @@ public class WitchController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java index c4db41cb9..39e08fff3 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityWither; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityWither; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftWither; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftWither; import org.bukkit.entity.Wither; import org.bukkit.util.Vector; @@ -43,14 +43,6 @@ public class WitherController extends MobEntityController { } } - @Override - public void bh() { - super.bh(); - if (npc != null) { - npc.update(); - } - } - @Override public boolean bH() { if (npc == null) @@ -59,11 +51,19 @@ public class WitherController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } + @Override + public void bi() { + super.bi(); + if (npc != null) { + npc.update(); + } + } + @Override public void c() { if (npc == null) { @@ -74,7 +74,7 @@ public class WitherController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -120,12 +120,12 @@ public class WitherController extends MobEntityController { NMS.updateAI(this); // taken from EntityLiving update method if (bd) { - /* boolean inLiquid = G() || I(); + /* boolean inLiquid = H() || J(); if (inLiquid) { motY += 0.04; } else //(handled elsewhere)*/ if (onGround && jumpTicks == 0) { - bd(); + be(); jumpTicks = 10; } } else { diff --git a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java index 198e948c8..da0fe7ed3 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityWolf; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityWolf; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftWolf; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftWolf; import org.bukkit.entity.Wolf; import org.bukkit.util.Vector; @@ -43,8 +43,8 @@ public class WolfController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) { npc.update(); } @@ -58,13 +58,13 @@ public class WolfController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java index 812b9b624..f0a0da628 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityZombie; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.EntityZombie; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftZombie; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftZombie; import org.bukkit.entity.Zombie; import org.bukkit.util.Vector; @@ -43,8 +43,8 @@ public class ZombieController extends MobEntityController { } @Override - public void bh() { - super.bh(); + public void bi() { + super.bi(); if (npc != null) { npc.update(); } @@ -58,13 +58,13 @@ public class ZombieController extends MobEntityController { if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) return super.bH(); if (super.bH()) { - a(true, false); // clearLeash with client update + unleash(true, false); // clearLeash with client update } return false; // shouldLeash } @Override - public void collide(net.minecraft.server.v1_6_R2.Entity entity) { + public void collide(net.minecraft.server.v1_6_R3.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java b/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java index 885885060..75acbc0de 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java @@ -1,21 +1,21 @@ package net.citizensnpcs.npc.network; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.MinecraftServer; -import net.minecraft.server.v1_6_R2.NetworkManager; -import net.minecraft.server.v1_6_R2.Packet; -import net.minecraft.server.v1_6_R2.Packet102WindowClick; -import net.minecraft.server.v1_6_R2.Packet106Transaction; -import net.minecraft.server.v1_6_R2.Packet10Flying; -import net.minecraft.server.v1_6_R2.Packet130UpdateSign; -import net.minecraft.server.v1_6_R2.Packet14BlockDig; -import net.minecraft.server.v1_6_R2.Packet15Place; -import net.minecraft.server.v1_6_R2.Packet16BlockItemSwitch; -import net.minecraft.server.v1_6_R2.Packet255KickDisconnect; -import net.minecraft.server.v1_6_R2.Packet28EntityVelocity; -import net.minecraft.server.v1_6_R2.Packet3Chat; -import net.minecraft.server.v1_6_R2.Packet51MapChunk; -import net.minecraft.server.v1_6_R2.PlayerConnection; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.MinecraftServer; +import net.minecraft.server.v1_6_R3.NetworkManager; +import net.minecraft.server.v1_6_R3.Packet; +import net.minecraft.server.v1_6_R3.Packet102WindowClick; +import net.minecraft.server.v1_6_R3.Packet106Transaction; +import net.minecraft.server.v1_6_R3.Packet10Flying; +import net.minecraft.server.v1_6_R3.Packet130UpdateSign; +import net.minecraft.server.v1_6_R3.Packet14BlockDig; +import net.minecraft.server.v1_6_R3.Packet15Place; +import net.minecraft.server.v1_6_R3.Packet16BlockItemSwitch; +import net.minecraft.server.v1_6_R3.Packet255KickDisconnect; +import net.minecraft.server.v1_6_R3.Packet28EntityVelocity; +import net.minecraft.server.v1_6_R3.Packet3Chat; +import net.minecraft.server.v1_6_R3.Packet51MapChunk; +import net.minecraft.server.v1_6_R3.PlayerConnection; public class EmptyNetHandler extends PlayerConnection { public EmptyNetHandler(MinecraftServer minecraftServer, NetworkManager networkManager, EntityPlayer entityPlayer) { diff --git a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java index 4268ddbbe..d873221fb 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java @@ -5,10 +5,10 @@ import java.net.Socket; import java.security.PrivateKey; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_6_R2.Connection; -import net.minecraft.server.v1_6_R2.IConsoleLogManager; -import net.minecraft.server.v1_6_R2.NetworkManager; -import net.minecraft.server.v1_6_R2.Packet; +import net.minecraft.server.v1_6_R3.Connection; +import net.minecraft.server.v1_6_R3.IConsoleLogManager; +import net.minecraft.server.v1_6_R3.NetworkManager; +import net.minecraft.server.v1_6_R3.Packet; public class EmptyNetworkManager extends NetworkManager { public EmptyNetworkManager(IConsoleLogManager logManager, Socket socket, String string, Connection conn, diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java index 6bf00fce9..374015830 100644 --- a/src/main/java/net/citizensnpcs/trait/Controllable.java +++ b/src/main/java/net/citizensnpcs/trait/Controllable.java @@ -14,12 +14,12 @@ import net.citizensnpcs.api.trait.trait.Owner; import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_6_R2.EntityEnderDragon; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.EntityPlayer; +import net.minecraft.server.v1_6_R3.EntityEnderDragon; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.EntityPlayer; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java index 1acad97e2..0ceabf934 100644 --- a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java +++ b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java @@ -1,8 +1,8 @@ package net.citizensnpcs.trait.waypoint; -import net.minecraft.server.v1_6_R2.DamageSource; -import net.minecraft.server.v1_6_R2.EntityEnderCrystal; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.DamageSource; +import net.minecraft.server.v1_6_R3.EntityEnderCrystal; +import net.minecraft.server.v1_6_R3.World; public class EntityEnderCrystalMarker extends EntityEnderCrystal { public EntityEnderCrystalMarker(World world) { @@ -15,7 +15,7 @@ public class EntityEnderCrystalMarker extends EntityEnderCrystal { } @Override - public boolean K() { + public boolean L() { return false; } diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java index 53f714801..ee2452c28 100644 --- a/src/main/java/net/citizensnpcs/util/NMS.java +++ b/src/main/java/net/citizensnpcs/util/NMS.java @@ -12,34 +12,34 @@ import java.util.WeakHashMap; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.npc.entity.EntityHumanNPC; -import net.minecraft.server.v1_6_R2.AttributeInstance; -import net.minecraft.server.v1_6_R2.ControllerJump; -import net.minecraft.server.v1_6_R2.DamageSource; -import net.minecraft.server.v1_6_R2.EnchantmentManager; -import net.minecraft.server.v1_6_R2.Entity; -import net.minecraft.server.v1_6_R2.EntityHorse; -import net.minecraft.server.v1_6_R2.EntityHuman; -import net.minecraft.server.v1_6_R2.EntityInsentient; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.EntityTypes; -import net.minecraft.server.v1_6_R2.GenericAttributes; -import net.minecraft.server.v1_6_R2.MathHelper; -import net.minecraft.server.v1_6_R2.MobEffectList; -import net.minecraft.server.v1_6_R2.Navigation; -import net.minecraft.server.v1_6_R2.NetworkManager; -import net.minecraft.server.v1_6_R2.Packet; -import net.minecraft.server.v1_6_R2.PathfinderGoalSelector; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.AttributeInstance; +import net.minecraft.server.v1_6_R3.ControllerJump; +import net.minecraft.server.v1_6_R3.DamageSource; +import net.minecraft.server.v1_6_R3.EnchantmentManager; +import net.minecraft.server.v1_6_R3.Entity; +import net.minecraft.server.v1_6_R3.EntityHorse; +import net.minecraft.server.v1_6_R3.EntityHuman; +import net.minecraft.server.v1_6_R3.EntityInsentient; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.EntityTypes; +import net.minecraft.server.v1_6_R3.GenericAttributes; +import net.minecraft.server.v1_6_R3.MathHelper; +import net.minecraft.server.v1_6_R3.MobEffectList; +import net.minecraft.server.v1_6_R3.Navigation; +import net.minecraft.server.v1_6_R3.NetworkManager; +import net.minecraft.server.v1_6_R3.Packet; +import net.minecraft.server.v1_6_R3.PathfinderGoalSelector; +import net.minecraft.server.v1_6_R3.World; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_6_R2.CraftServer; -import org.bukkit.craftbukkit.v1_6_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_6_R3.CraftServer; +import org.bukkit.craftbukkit.v1_6_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse; import org.bukkit.entity.LivingEntity; @@ -97,8 +97,9 @@ public class NMS { int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle); - if (fireAspectLevel > 0) + if (fireAspectLevel > 0) { target.setOnFire(fireAspectLevel * 4); + } } public static void changeWorlds(org.bukkit.entity.Entity entity, org.bukkit.World world) { @@ -147,7 +148,7 @@ public class NMS { return ((CraftLivingEntity) entity).getHandle(); } - public static net.minecraft.server.v1_6_R2.Entity getHandle(org.bukkit.entity.Entity entity) { + public static net.minecraft.server.v1_6_R3.Entity getHandle(org.bukkit.entity.Entity entity) { return ((CraftEntity) entity).getHandle(); } @@ -179,7 +180,7 @@ public class NMS { public static boolean inWater(LivingEntity entity) { EntityLiving mcEntity = getHandle(entity); - return mcEntity.G() || mcEntity.I(); + return mcEntity.H() || mcEntity.J(); } public static boolean isNavigationFinished(Navigation navigation) { @@ -323,7 +324,7 @@ public class NMS { entity.Y = height; } - public static boolean shouldJump(net.minecraft.server.v1_6_R2.Entity entity) { + public static boolean shouldJump(net.minecraft.server.v1_6_R3.Entity entity) { if (JUMP_FIELD == null || !(entity instanceof EntityLiving)) return false; try { diff --git a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java index abe0ec6ee..39280cd37 100644 --- a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java +++ b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java @@ -2,13 +2,13 @@ package net.citizensnpcs.util; import java.util.Arrays; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.Packet; -import net.minecraft.server.v1_6_R2.Packet17EntityLocationAction; -import net.minecraft.server.v1_6_R2.Packet18ArmAnimation; -import net.minecraft.server.v1_6_R2.Packet40EntityMetadata; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.Packet; +import net.minecraft.server.v1_6_R3.Packet17EntityLocationAction; +import net.minecraft.server.v1_6_R3.Packet18ArmAnimation; +import net.minecraft.server.v1_6_R3.Packet40EntityMetadata; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer; import org.bukkit.entity.Player; public enum PlayerAnimation { diff --git a/src/main/java/net/citizensnpcs/util/nms/PlayerControllerLook.java b/src/main/java/net/citizensnpcs/util/nms/PlayerControllerLook.java index 43623f872..e5b1777eb 100644 --- a/src/main/java/net/citizensnpcs/util/nms/PlayerControllerLook.java +++ b/src/main/java/net/citizensnpcs/util/nms/PlayerControllerLook.java @@ -1,9 +1,9 @@ package net.citizensnpcs.util.nms; import net.citizensnpcs.npc.entity.EntityHumanNPC; -import net.minecraft.server.v1_6_R2.Entity; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.MathHelper; +import net.minecraft.server.v1_6_R3.Entity; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.MathHelper; public class PlayerControllerLook { private final EntityHumanNPC a; diff --git a/src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java b/src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java index 7dd9cc6e9..20f54c156 100644 --- a/src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java +++ b/src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java @@ -2,9 +2,9 @@ package net.citizensnpcs.util.nms; import net.citizensnpcs.npc.entity.EntityHumanNPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_6_R2.AttributeInstance; -import net.minecraft.server.v1_6_R2.GenericAttributes; -import net.minecraft.server.v1_6_R2.MathHelper; +import net.minecraft.server.v1_6_R3.AttributeInstance; +import net.minecraft.server.v1_6_R3.GenericAttributes; +import net.minecraft.server.v1_6_R3.MathHelper; public class PlayerControllerMove { private final EntityHumanNPC a; diff --git a/src/main/java/net/citizensnpcs/util/nms/PlayerNavigation.java b/src/main/java/net/citizensnpcs/util/nms/PlayerNavigation.java index cac59baed..3cb435860 100644 --- a/src/main/java/net/citizensnpcs/util/nms/PlayerNavigation.java +++ b/src/main/java/net/citizensnpcs/util/nms/PlayerNavigation.java @@ -1,19 +1,19 @@ package net.citizensnpcs.util.nms; import net.citizensnpcs.npc.entity.EntityHumanNPC; -import net.minecraft.server.v1_6_R2.AttributeInstance; -import net.minecraft.server.v1_6_R2.Block; -import net.minecraft.server.v1_6_R2.Entity; -import net.minecraft.server.v1_6_R2.EntityInsentient; -import net.minecraft.server.v1_6_R2.GenericAttributes; -import net.minecraft.server.v1_6_R2.IBlockAccess; -import net.minecraft.server.v1_6_R2.Material; -import net.minecraft.server.v1_6_R2.MathHelper; -import net.minecraft.server.v1_6_R2.Navigation; -import net.minecraft.server.v1_6_R2.PathEntity; -import net.minecraft.server.v1_6_R2.PathPoint; -import net.minecraft.server.v1_6_R2.Vec3D; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.AttributeInstance; +import net.minecraft.server.v1_6_R3.Block; +import net.minecraft.server.v1_6_R3.Entity; +import net.minecraft.server.v1_6_R3.EntityInsentient; +import net.minecraft.server.v1_6_R3.GenericAttributes; +import net.minecraft.server.v1_6_R3.IBlockAccess; +import net.minecraft.server.v1_6_R3.Material; +import net.minecraft.server.v1_6_R3.MathHelper; +import net.minecraft.server.v1_6_R3.Navigation; +import net.minecraft.server.v1_6_R3.PathEntity; +import net.minecraft.server.v1_6_R3.PathPoint; +import net.minecraft.server.v1_6_R3.Vec3D; +import net.minecraft.server.v1_6_R3.World; public class PlayerNavigation extends Navigation { private final EntityHumanNPC a; @@ -98,7 +98,7 @@ public class PlayerNavigation extends Navigation { Material material = Block.byId[k2].material; - if (material == Material.WATER && !this.a.G()) { + if (material == Material.WATER && !this.a.H()) { return false; } @@ -339,7 +339,7 @@ public class PlayerNavigation extends Navigation { } private int k() { - if (this.a.G() && this.m) { + if (this.a.H() && this.m) { int i = (int) this.a.boundingBox.b; int j = this.b.getTypeId(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ)); int k = 0; @@ -365,7 +365,7 @@ public class PlayerNavigation extends Navigation { } private boolean m() { - return this.a.G() || this.a.I(); + return this.a.H() || this.a.J(); } private void n() { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index f2e1663a6..7ce5b3829 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ authors: [aPunch, fullwall] softdepend: [Vault] version: ${project.version} (build ${BUILD_NUMBER}) main: net.citizensnpcs.Citizens -website: http://www.citizensnpcs.com +website: http://www.citizensnpcs.co commands: traitc: aliases: [trc]