From 5b5df254d554f6288a496023abc3a32d6a628ee4 Mon Sep 17 00:00:00 2001
From: ementalo <ementalodev@gmx.co.uk>
Date: Fri, 13 Apr 2012 14:49:15 +0100
Subject: [PATCH] Don't kill tamed ocelots with killall Test #1921

---
 .../com/earth2me/essentials/commands/Commandkillall.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

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)