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

Selective merge of commanding branch.

Browse Source
This commit is contained in:
MattBDev
2019-10-23 12:58:36 -04:00
parent 8768085479
commit fd408c64ed
17 changed files with 259 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
View File

@ -117,7 +117,7 @@ public class SelectionCommands {
}
if (!session.getRegionSelector(world).selectPrimary(pos.toBlockPoint(), ActorSelectorLimits.forActor(actor))) {
actor.print(BBC.SELECTOR_ALREADY_SET.s());
actor.printError(BBC.SELECTOR_ALREADY_SET.s());
return;
}
@ -146,7 +146,7 @@ public class SelectionCommands {
}
if (!session.getRegionSelector(world).selectSecondary(pos.toBlockPoint(), ActorSelectorLimits.forActor(actor))) {
actor.print(BBC.SELECTOR_ALREADY_SET.s());
actor.printError(BBC.SELECTOR_ALREADY_SET.s());
return;
}
@ -165,14 +165,14 @@ public class SelectionCommands {
if (pos != null) {
if (!session.getRegionSelector(player.getWorld()).selectPrimary(pos.toBlockPoint(), ActorSelectorLimits.forActor(player))) {
player.print(BBC.SELECTOR_ALREADY_SET.s());
player.printError(BBC.SELECTOR_ALREADY_SET.s());
return;
}
session.getRegionSelector(player.getWorld())
.explainPrimarySelection(player, session, pos.toBlockPoint());
} else {
player.print(BBC.NO_BLOCK.s());
player.printError(BBC.NO_BLOCK.s());
}
}
@ -187,14 +187,14 @@ public class SelectionCommands {
if (pos != null) {
if (!session.getRegionSelector(player.getWorld()).selectSecondary(pos.toBlockPoint(), ActorSelectorLimits.forActor(player))) {
player.print(BBC.SELECTOR_ALREADY_SET.s());
player.printError(BBC.SELECTOR_ALREADY_SET.s());
return;
}
session.getRegionSelector(player.getWorld())
.explainSecondarySelection(player, session, pos.toBlockPoint());
} else {
player.print(BBC.NO_BLOCK.s());
player.printError(BBC.NO_BLOCK.s());
}
}