Removed wolves from /butcher. There's no way to check if a wolf is owned or not in Bukkit yet.

This commit is contained in:
sk89q 2011-05-01 16:03:27 -07:00
parent c8058f65fc
commit c7dff09f11

View File

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