mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2025-07-05 20:36:42 +00:00
The /butcher command no longer kills NPCs, except when the -n flag is passed.
Also: - Moved some code from BukkitWorld to LocalWorld. - Replaced the "boolean killPets" argument by an "int flags" to provide extensibility - Made the radius argument a double - Basically rewrote the entire function - Deprecated all old versions of killMobs
This commit is contained in:
@ -32,6 +32,14 @@ import com.sk89q.worldedit.regions.Region;
|
||||
* @author sk89q
|
||||
*/
|
||||
public abstract class LocalWorld {
|
||||
/**
|
||||
* Named flags to use as parameters to {@link LocalWorld#killMobs(Vector, int, int)}
|
||||
*/
|
||||
public class KillFlags {
|
||||
public static final int PETS = 1 << 0;
|
||||
public static final int NPCS = 1 << 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Random generator.
|
||||
*/
|
||||
@ -268,17 +276,35 @@ public abstract class LocalWorld {
|
||||
* @param radius
|
||||
* @return
|
||||
*/
|
||||
public abstract int killMobs(Vector origin, int radius);
|
||||
@Deprecated
|
||||
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 flags various flags that determine what to kill
|
||||
* @return
|
||||
*/
|
||||
@Deprecated
|
||||
public int killMobs(Vector origin, int radius, boolean killPets) {
|
||||
return killMobs(origin, radius, killPets ? KillFlags.PETS : 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Kill mobs in an area.
|
||||
*
|
||||
* @param origin
|
||||
* @param radius
|
||||
* @param killPets
|
||||
* @param killflags
|
||||
* @return
|
||||
*/
|
||||
public abstract int killMobs(Vector origin, int radius, boolean killPets);
|
||||
public int killMobs(Vector origin, double radius, int flags) {
|
||||
return killMobs(origin, (int) radius, (flags & KillFlags.PETS) != 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove entities in an area.
|
||||
|
Reference in New Issue
Block a user