mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-08-28 11:24:34 +00:00
Added -p flag to //butcher to kill pet wolves.
This commit is contained in:
parent
f97c765623
commit
8f032fb2ea
@ -256,7 +256,7 @@ public abstract class LocalWorld {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Kill mobs in an area.
|
* Kill mobs in an area, excluding pet wolves.
|
||||||
*
|
*
|
||||||
* @param origin
|
* @param origin
|
||||||
* @param radius
|
* @param radius
|
||||||
@ -264,6 +264,16 @@ public abstract class LocalWorld {
|
|||||||
*/
|
*/
|
||||||
public abstract int killMobs(Vector origin, int radius);
|
public abstract int killMobs(Vector origin, int radius);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Kill mobs in an area.
|
||||||
|
*
|
||||||
|
* @param origin
|
||||||
|
* @param radius
|
||||||
|
* @param killPets
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public abstract int killMobs(Vector origin, int radius, boolean killPets);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove entities in an area.
|
* Remove entities in an area.
|
||||||
*
|
*
|
||||||
|
@ -391,7 +391,7 @@ public class BukkitWorld extends LocalWorld {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Kill mobs in an area.
|
* Kill mobs in an area, excluding tamed wolves.
|
||||||
*
|
*
|
||||||
* @param origin
|
* @param origin
|
||||||
* @param radius -1 for all mobs
|
* @param radius -1 for all mobs
|
||||||
@ -399,12 +399,27 @@ public class BukkitWorld extends LocalWorld {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int killMobs(Vector origin, int radius) {
|
public int killMobs(Vector origin, int radius) {
|
||||||
|
return killMobs(origin, radius, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Kill mobs in an area.
|
||||||
|
*
|
||||||
|
* @param origin
|
||||||
|
* @param radius -1 for all mobs
|
||||||
|
* @param killPets true to kill tames wolves
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int killMobs(Vector origin, int radius, boolean killPets) {
|
||||||
int num = 0;
|
int num = 0;
|
||||||
double radiusSq = Math.pow(radius, 2);
|
double radiusSq = Math.pow(radius, 2);
|
||||||
|
|
||||||
for (LivingEntity ent : world.getLivingEntities()) {
|
for (LivingEntity ent : world.getLivingEntities()) {
|
||||||
if ((ent instanceof Creature || ent instanceof Ghast || ent instanceof Slime)
|
if (!killPets && ent instanceof Wolf && ((Wolf) ent).isTamed()) {
|
||||||
&& !(ent instanceof Wolf)) {
|
continue; // tamed wolf
|
||||||
|
}
|
||||||
|
if (ent instanceof Creature || ent instanceof Ghast || ent instanceof Slime) {
|
||||||
if (radius == -1
|
if (radius == -1
|
||||||
|| origin.distanceSq(BukkitUtil.toVector(ent.getLocation())) <= radiusSq) {
|
|| origin.distanceSq(BukkitUtil.toVector(ent.getLocation())) <= radiusSq) {
|
||||||
ent.remove();
|
ent.remove();
|
||||||
|
@ -307,6 +307,7 @@ public class UtilityCommands {
|
|||||||
@Command(
|
@Command(
|
||||||
aliases = {"butcher"},
|
aliases = {"butcher"},
|
||||||
usage = "[radius]",
|
usage = "[radius]",
|
||||||
|
flags = "p",
|
||||||
desc = "Kill all or nearby mobs",
|
desc = "Kill all or nearby mobs",
|
||||||
min = 0,
|
min = 0,
|
||||||
max = 1
|
max = 1
|
||||||
@ -320,7 +321,7 @@ public class UtilityCommands {
|
|||||||
Math.max(1, args.getInteger(0)) : -1;
|
Math.max(1, args.getInteger(0)) : -1;
|
||||||
|
|
||||||
Vector origin = session.getPlacementPosition(player);
|
Vector origin = session.getPlacementPosition(player);
|
||||||
int killed = player.getWorld().killMobs(origin, radius);
|
int killed = player.getWorld().killMobs(origin, radius, args.hasFlag('p'));
|
||||||
player.print("Killed " + killed + " mobs.");
|
player.print("Killed " + killed + " mobs.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user