Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-08 18:00:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made //butcher apply to enderdragons

Browse Source
This commit is contained in:
Wizjany 2011-10-29 14:42:51 -04:00
parent 0c9c213e4e
commit 19194ccb88
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
View File

@ -33,6 +33,7 @@ import org.bukkit.block.Sign;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.entity.Boat; import org.bukkit.entity.Boat;
import org.bukkit.entity.Creature; import org.bukkit.entity.Creature;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.ExperienceOrb;
import org.bukkit.entity.Ghast; import org.bukkit.entity.Ghast;
@ -42,7 +43,7 @@ import org.bukkit.entity.Minecart;
import org.bukkit.entity.Painting; import org.bukkit.entity.Painting;
import org.bukkit.entity.Slime; import org.bukkit.entity.Slime;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Tameable;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -503,10 +504,10 @@ public class BukkitWorld extends LocalWorld {
double radiusSq = Math.pow(radius, 2); double radiusSq = Math.pow(radius, 2);
for (LivingEntity ent : world.getLivingEntities()) { for (LivingEntity ent : world.getLivingEntities()) {
if (!killPets && ent instanceof Wolf && ((Wolf) ent).isTamed()) { if (!killPets && ent instanceof Tameable && ((Tameable) ent).isTamed()) {
continue; // tamed wolf continue; // tamed wolf
} }
if (ent instanceof Creature || ent instanceof Ghast || ent instanceof Slime) { if (ent instanceof Creature || ent instanceof Ghast || ent instanceof Slime || ent instanceof EnderDragon) {
if (radius == -1 if (radius == -1
|| origin.distanceSq(BukkitUtil.toVector(ent.getLocation())) <= radiusSq) { || origin.distanceSq(BukkitUtil.toVector(ent.getLocation())) <= radiusSq) {
ent.remove(); ent.remove();