diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-04-13 14:49:15 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-04-13 14:49:15 +0100 |
| commit | f67defff0b8166fc32d7b16f13bb7def87b00547 (patch) | |
| tree | e43f881a273b850852f5a56dc6a23c776085375e | |
| parent | d6c5492e12a721b40dc57688c4bdab576bf57769 (diff) | |
| download | Essentials-f67defff0b8166fc32d7b16f13bb7def87b00547.tar Essentials-f67defff0b8166fc32d7b16f13bb7def87b00547.tar.gz Essentials-f67defff0b8166fc32d7b16f13bb7def87b00547.tar.lz Essentials-f67defff0b8166fc32d7b16f13bb7def87b00547.tar.xz Essentials-f67defff0b8166fc32d7b16f13bb7def87b00547.zip | |
Don't kill tamed ocelots with killall Test #1921
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandkillall.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java index a455ccc20..d918eeffb 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java @@ -16,6 +16,7 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Monster; import org.bukkit.entity.NPC; +import org.bukkit.entity.Ocelot; import org.bukkit.entity.Player; import org.bukkit.entity.Slime; import org.bukkit.entity.Snowman; @@ -121,6 +122,13 @@ public class Commandkillall extends EssentialsCommand continue; } } + if(entity instanceof Ocelot) + { + if (((Ocelot)entity).isTamed()) + { + continue; + } + } if (animals) { if (entity instanceof Animals || entity instanceof NPC || entity instanceof Snowman || entity instanceof WaterMob) |