From c7dff09f116902e0077635682f54e3efe01e1097 Mon Sep 17 00:00:00 2001 From: sk89q Date: Sun, 1 May 2011 16:03:27 -0700 Subject: [PATCH] Removed wolves from /butcher. There's no way to check if a wolf is owned or not in Bukkit yet. --- src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java index 8527bb7bf..8e6431099 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java @@ -35,6 +35,7 @@ import org.bukkit.entity.Minecart; import org.bukkit.entity.Painting; import org.bukkit.entity.Slime; import org.bukkit.entity.TNTPrimed; +import org.bukkit.entity.Wolf; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.Location; @@ -402,7 +403,8 @@ public class BukkitWorld extends LocalWorld { double radiusSq = Math.pow(radius, 2); for (LivingEntity ent : world.getLivingEntities()) { - if (ent instanceof Creature || ent instanceof Ghast || ent instanceof Slime) { + if ((ent instanceof Creature || ent instanceof Ghast || ent instanceof Slime) + && !(ent instanceof Wolf)) { if (radius == -1 || origin.distanceSq(BukkitUtil.toVector(ent.getLocation())) <= radiusSq) { ent.remove();