Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-02 03:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Jesse Boyd
2019-08-07 01:32:05 +10:00
parent a476ab1ea0 5c6c41a95a
commit 4c2b753687
190 changed files with 162 additions and 20609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
View File

@ -176,9 +176,9 @@ public class UtilityCommands {
)
@CommandPermissions("fawe.cancel")
@CommandQueued(false)
public void cancel(FawePlayer player) {
int cancelled = player.cancel(false);
BBC.WORLDEDIT_CANCEL_COUNT.send(player, cancelled);
public void cancel(FawePlayer fp) {
int cancelled = fp.cancel(false);
BBC.WORLDEDIT_CANCEL_COUNT.send(fp, cancelled);
}
@Command(
@ -361,15 +361,15 @@ public class UtilityCommands {
@CommandPermissions("worldedit.removeabove")
@Logging(PLACEMENT)
public int removeAbove(Player player, LocalSession session, EditSession editSession,
@Range(min=1) @Arg(desc = "The apothem of the square to remove from", def = "1")
int size,
@Range(min=1) @Arg(name = "size", desc = "The apothem of the square to remove from", def = "1")
int sizeOpt,
@Arg(desc = "The maximum height above you to remove from", def = "")
Integer height) throws WorldEditException {
size = Math.max(1, size);
we.checkMaxRadius(size);
sizeOpt = Math.max(1, sizeOpt);
we.checkMaxRadius(sizeOpt);
World world = player.getWorld();
height = height != null ? Math.min((world.getMaxY() + 1), height + 1) : (world.getMaxY() + 1);
int affected = editSession.removeAbove(session.getPlacementPosition(player), size, height);
int affected = editSession.removeAbove(session.getPlacementPosition(player), sizeOpt, height);
BBC.VISITOR_BLOCK.send(player, affected);
return affected;
}
@ -382,16 +382,16 @@ public class UtilityCommands {
@CommandPermissions("worldedit.removebelow")
@Logging(PLACEMENT)
public int removeBelow(Player player, LocalSession session, EditSession editSession,
@Arg(desc = "The apothem of the square to remove from", def = "1")
int size,
@Arg(name = "size", desc = "The apothem of the square to remove from", def = "1")
int sizeOpt,
@Arg(desc = "The maximum height below you to remove from", def = "")
Integer height) throws WorldEditException {
size = Math.max(1, size);
we.checkMaxRadius(size);
sizeOpt = Math.max(1, sizeOpt);
we.checkMaxRadius(sizeOpt);
World world = player.getWorld();
height = height != null ? Math.min((world.getMaxY() + 1), height + 1) : (world.getMaxY() + 1);
int affected = editSession.removeBelow(session.getPlacementPosition(player), size, height);
int affected = editSession.removeBelow(session.getPlacementPosition(player), sizeOpt, height);
BBC.VISITOR_BLOCK.send(player, affected);
return affected;
}