Added a -a flag to /butcher to kill animals. Its now disabled by default.

This commit is contained in:
TomyLobo
2011-12-06 07:08:32 +01:00
parent bc3a4377ec
commit c21c380bba
3 changed files with 12 additions and 3 deletions

View File

@ -33,6 +33,7 @@ import org.bukkit.block.Furnace;
import org.bukkit.block.CreatureSpawner;
import org.bukkit.block.Sign;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Animals;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Boat;
import org.bukkit.entity.Entity;
@ -500,6 +501,7 @@ public class BukkitWorld extends LocalWorld {
public int killMobs(Vector origin, double radius, int flags) {
boolean killPets = (flags & KillFlags.PETS) != 0;
boolean killNPCs = (flags & KillFlags.NPCS) != 0;
boolean killAnimals = (flags & KillFlags.ANIMALS) != 0;
int num = 0;
double radiusSq = radius * radius;
@ -511,6 +513,10 @@ public class BukkitWorld extends LocalWorld {
continue;
}
if (!killAnimals && ent instanceof Animals) {
continue;
}
if (!killPets && ent instanceof Tameable && ((Tameable) ent).isTamed()) {
continue; // tamed wolf
}