diff --git a/src/net/theprogrammersworld/herobrine/nms/entity/CustomEntity.java b/src/net/theprogrammersworld/herobrine/nms/entity/CustomEntity.java index fbe0827..d38a0a4 100644 --- a/src/net/theprogrammersworld/herobrine/nms/entity/CustomEntity.java +++ b/src/net/theprogrammersworld/herobrine/nms/entity/CustomEntity.java @@ -2,7 +2,7 @@ package net.theprogrammersworld.herobrine.nms.entity; public interface CustomEntity { - void kill(); + void killCustom(); MobType getMobType(); diff --git a/src/net/theprogrammersworld/herobrine/nms/entity/CustomSkeleton.java b/src/net/theprogrammersworld/herobrine/nms/entity/CustomSkeleton.java index f937fd2..9af1192 100644 --- a/src/net/theprogrammersworld/herobrine/nms/entity/CustomSkeleton.java +++ b/src/net/theprogrammersworld/herobrine/nms/entity/CustomSkeleton.java @@ -47,7 +47,7 @@ public class CustomSkeleton extends EntitySkeleton implements CustomEntity { @Override @SuppressWarnings("deprecation") - public void kill() { + public void killCustom() { for (int i = 1; i <= 2500; ++i) { if (Herobrine.getPluginCore().getConfigDB().npc.contains("npc.Demon.Drops." + Integer.toString(i))) { final int chance = new Random().nextInt(100); diff --git a/src/net/theprogrammersworld/herobrine/nms/entity/CustomZombie.java b/src/net/theprogrammersworld/herobrine/nms/entity/CustomZombie.java index 1ea0236..b675c8d 100644 --- a/src/net/theprogrammersworld/herobrine/nms/entity/CustomZombie.java +++ b/src/net/theprogrammersworld/herobrine/nms/entity/CustomZombie.java @@ -60,7 +60,7 @@ public class CustomZombie extends EntityZombie implements CustomEntity { @Override @SuppressWarnings("deprecation") - public void kill() { + public void killCustom() { String mobS = ""; if (mobType == MobType.ARTIFACT_GUARDIAN) { mobS = "Guardian"; diff --git a/src/net/theprogrammersworld/herobrine/nms/entity/EntityManager.java b/src/net/theprogrammersworld/herobrine/nms/entity/EntityManager.java index dae9978..2fce77f 100644 --- a/src/net/theprogrammersworld/herobrine/nms/entity/EntityManager.java +++ b/src/net/theprogrammersworld/herobrine/nms/entity/EntityManager.java @@ -35,7 +35,7 @@ public class EntityManager { } public void removeMob(final int id) { - mobList.get(new Integer(id)).kill(); + mobList.get(new Integer(id)).killCustom(); mobList.remove(new Integer(id)); } @@ -45,7 +45,7 @@ public class EntityManager { public void killAllMobs() { for (final Map.Entry s : mobList.entrySet()) { - s.getValue().kill(); + s.getValue().killCustom(); } removeAllMobs(); }