Don't kill tamed ocelots with killall Test #1921

This commit is contained in:
ementalo 2012-04-13 14:49:15 +01:00
parent bbd2c53dd8
commit 5b5df254d5

View File

@ -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)