From c09a3b9db442c3ca173d1d8a9d17a29a681ea167 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sat, 19 Jan 2013 20:42:03 +0800 Subject: [PATCH] Fix build --- src/main/java/net/citizensnpcs/npc/entity/BatController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/BlazeController.java | 4 ++-- .../net/citizensnpcs/npc/entity/CaveSpiderController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/ChickenController.java | 4 ++-- src/main/java/net/citizensnpcs/npc/entity/CowController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/CreeperController.java | 4 ++-- .../net/citizensnpcs/npc/entity/EnderDragonController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/EndermanController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/GhastController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/GiantController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/IronGolemController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/MagmaCubeController.java | 4 ++-- .../net/citizensnpcs/npc/entity/MushroomCowController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/OcelotController.java | 4 ++-- src/main/java/net/citizensnpcs/npc/entity/PigController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/PigZombieController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/SheepController.java | 4 ++-- .../net/citizensnpcs/npc/entity/SilverfishController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/SkeletonController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/SlimeController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/SnowmanController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/SpiderController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/SquidController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/VillagerController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/WitchController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/WitherController.java | 4 ++-- src/main/java/net/citizensnpcs/npc/entity/WolfController.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/ZombieController.java | 4 ++-- 28 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/main/java/net/citizensnpcs/npc/entity/BatController.java b/src/main/java/net/citizensnpcs/npc/entity/BatController.java index 7c2826318..dabe6c7f8 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BatController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BatController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftBat; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.entity.Bat; -import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public class BatController extends MobEntityController { @@ -99,7 +99,7 @@ public class BatController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new BatNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java index 6d48676b8..0b91f511d 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.entity.Blaze; -import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public class BlazeController extends MobEntityController { @@ -97,7 +97,7 @@ public class BlazeController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new BlazeNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java index 4f80e607c..680536c83 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.entity.CaveSpider; -import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public class CaveSpiderController extends MobEntityController { @@ -106,7 +106,7 @@ public class CaveSpiderController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new CaveSpiderNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java index bce615406..105a1ea96 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.entity.Chicken; -import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public class ChickenController extends MobEntityController { @@ -96,7 +96,7 @@ public class ChickenController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new ChickenNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CowController.java b/src/main/java/net/citizensnpcs/npc/entity/CowController.java index 4c05bfae2..07d39f2d4 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CowController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftCow; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.entity.Cow; -import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public class CowController extends MobEntityController { @@ -96,7 +96,7 @@ public class CowController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new CowNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java index 37c72cd94..329cbd8bd 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java @@ -14,8 +14,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.entity.Creeper; -import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public class CreeperController extends MobEntityController { @@ -103,7 +103,7 @@ public class CreeperController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new CreeperNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java index ef24b0519..85fdee4f5 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.entity.EnderDragon; -import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public class EnderDragonController extends MobEntityController { @@ -103,7 +103,7 @@ public class EnderDragonController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new EnderDragonNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java index ba05a0b94..7720d8dd3 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.entity.Enderman; -import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public class EndermanController extends MobEntityController { @@ -116,7 +116,7 @@ public class EndermanController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new EndermanNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java index 6a488e193..88bfa0741 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftGhast; -import org.bukkit.entity.Entity; import org.bukkit.entity.Ghast; import org.bukkit.util.Vector; @@ -83,7 +83,7 @@ public class GhastController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new GhastNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java index a0ad500de..d35d20e4b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftGiant; -import org.bukkit.entity.Entity; import org.bukkit.entity.Giant; import org.bukkit.util.Vector; @@ -83,7 +83,7 @@ public class GiantController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new GiantNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java index 3e4d4b8d8..c7708db15 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftIronGolem; -import org.bukkit.entity.Entity; import org.bukkit.entity.IronGolem; import org.bukkit.util.Vector; @@ -81,7 +81,7 @@ public class IronGolemController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new IronGolemNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java index 262a47eda..c6207d2de 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftMagmaCube; -import org.bukkit.entity.Entity; import org.bukkit.entity.MagmaCube; import org.bukkit.util.Vector; @@ -93,7 +93,7 @@ public class MagmaCubeController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new MagmaCubeNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java index ec2da03f8..5f72777ae 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftMushroomCow; -import org.bukkit.entity.Entity; import org.bukkit.entity.MushroomCow; import org.bukkit.util.Vector; @@ -83,7 +83,7 @@ public class MushroomCowController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new MushroomCowNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java index deb957610..bef81aada 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftOcelot; -import org.bukkit.entity.Entity; import org.bukkit.entity.Ocelot; import org.bukkit.util.Vector; @@ -82,7 +82,7 @@ public class OcelotController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new OcelotNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigController.java b/src/main/java/net/citizensnpcs/npc/entity/PigController.java index 2e52e506b..76b4d4011 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPig; -import org.bukkit.entity.Entity; import org.bukkit.entity.Pig; import org.bukkit.util.Vector; @@ -89,7 +89,7 @@ public class PigController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new PigNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java index 21505a6e9..bd7def044 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPigZombie; -import org.bukkit.entity.Entity; import org.bukkit.entity.PigZombie; import org.bukkit.util.Vector; @@ -93,7 +93,7 @@ public class PigZombieController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new PigZombieNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java index 5a7d4d605..1d7020570 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftSheep; -import org.bukkit.entity.Entity; import org.bukkit.entity.Sheep; import org.bukkit.util.Vector; @@ -82,7 +82,7 @@ public class SheepController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new SheepNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java index 00715b050..996464100 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftSilverfish; -import org.bukkit.entity.Entity; import org.bukkit.entity.Silverfish; import org.bukkit.util.Vector; @@ -92,7 +92,7 @@ public class SilverfishController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new SilverfishNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java index 49fc9dec5..cbc05b383 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftSkeleton; -import org.bukkit.entity.Entity; import org.bukkit.entity.Skeleton; import org.bukkit.util.Vector; @@ -82,7 +82,7 @@ public class SkeletonController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new SkeletonNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java index cd1e8a104..822575601 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftSlime; -import org.bukkit.entity.Entity; import org.bukkit.entity.Slime; import org.bukkit.util.Vector; @@ -94,7 +94,7 @@ public class SlimeController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new SlimeNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java index f5f02771b..2862a9353 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftSnowman; -import org.bukkit.entity.Entity; import org.bukkit.entity.Snowman; import org.bukkit.util.Vector; @@ -82,7 +82,7 @@ public class SnowmanController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new SnowmanNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java index f60180b54..ff56aea5e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftSpider; -import org.bukkit.entity.Entity; import org.bukkit.entity.Spider; import org.bukkit.util.Vector; @@ -92,7 +92,7 @@ public class SpiderController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new SpiderNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java index af9c14e2c..9972a7882 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftSquid; -import org.bukkit.entity.Entity; import org.bukkit.entity.Squid; import org.bukkit.util.Vector; @@ -83,7 +83,7 @@ public class SquidController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new SquidNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java index da053fb1f..0faedaa62 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java @@ -13,8 +13,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftVillager; -import org.bukkit.entity.Entity; import org.bukkit.entity.Villager; import org.bukkit.util.Vector; @@ -90,7 +90,7 @@ public class VillagerController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new VillagerNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java index aa92e92ae..8a32cec29 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftWitch; -import org.bukkit.entity.Entity; import org.bukkit.entity.Witch; import org.bukkit.util.Vector; @@ -82,7 +82,7 @@ public class WitchController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new WitchNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java index 4159fd860..e8afa00bf 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftWither; -import org.bukkit.entity.Entity; import org.bukkit.entity.Wither; import org.bukkit.util.Vector; @@ -88,7 +88,7 @@ public class WitherController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new WitherNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java index b988b3f1f..b31b4db5f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftWolf; -import org.bukkit.entity.Entity; import org.bukkit.entity.Wolf; import org.bukkit.util.Vector; @@ -82,7 +82,7 @@ public class WolfController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new WolfNPC(this); return super.getBukkitEntity(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java index 3f45b0a3a..d858395f9 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java @@ -12,8 +12,8 @@ import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftZombie; -import org.bukkit.entity.Entity; import org.bukkit.entity.Zombie; import org.bukkit.util.Vector; @@ -82,7 +82,7 @@ public class ZombieController extends MobEntityController { } @Override - public Entity getBukkitEntity() { + public CraftEntity getBukkitEntity() { if (bukkitEntity == null && npc != null) bukkitEntity = new ZombieNPC(this); return super.getBukkitEntity();