Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed /butcher not working correctly in-game.

Browse Source 
@Optional does not work on parameter bindings of the PROVIDES type at
this time.

Fixes WORLDEDIT-3139.
This commit is contained in:
sk89q 2014-07-01 15:04:30 -07:00
parent ede28df487
commit 8f8d991ee1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
View File

@ -375,9 +375,9 @@ public class UtilityCommands {
) )
@CommandPermissions("worldedit.butcher") @CommandPermissions("worldedit.butcher")
@Logging(PLACEMENT) @Logging(PLACEMENT)
public void butcher(Actor actor, @Optional Player player, @Optional LocalSession session, CommandContext args) throws WorldEditException { public void butcher(Actor actor, CommandContext args) throws WorldEditException {
LocalConfiguration config = we.getConfiguration(); LocalConfiguration config = we.getConfiguration();
Player player = actor instanceof Player ? (Player) actor : null;
// technically the default can be larger than the max, but that's not my problem // technically the default can be larger than the max, but that's not my problem
int radius = config.butcherDefaultRadius; int radius = config.butcherDefaultRadius;
@ -407,6 +407,7 @@ public class UtilityCommands {
int killed; int killed;
if (player != null) { if (player != null) {
LocalSession session = we.getSessionManager().get(player);
killed = player.getWorld().killMobs(session.getPlacementPosition(player), radius, flags.flags); killed = player.getWorld().killMobs(session.getPlacementPosition(player), radius, flags.flags);
} else { } else {
killed = 0; killed = 0;