Skip to content

Commit a239f88

Browse files
authored
Properly handle incomplete selection in RegionCommands (#3388)
1 parent 8090431 commit a239f88

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/ProvideBindings.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.fastasyncworldedit.core.util.TextureUtil;
1212
import com.fastasyncworldedit.core.util.image.ImageUtil;
1313
import com.sk89q.worldedit.EditSession;
14-
import com.sk89q.worldedit.IncompleteRegionException;
1514
import com.sk89q.worldedit.LocalSession;
1615
import com.sk89q.worldedit.WorldEdit;
1716
import com.sk89q.worldedit.command.argument.Arguments;
@@ -21,7 +20,6 @@
2120
import com.sk89q.worldedit.extension.input.InputParseException;
2221
import com.sk89q.worldedit.extension.platform.Actor;
2322
import com.sk89q.worldedit.extent.Extent;
24-
import com.sk89q.worldedit.internal.annotation.Selection;
2523
import com.sk89q.worldedit.regions.Region;
2624
import com.sk89q.worldedit.session.request.Request;
2725
import com.sk89q.worldedit.world.World;
@@ -89,16 +87,6 @@ public EditSession editSession(LocalSession localSession, Actor actor, InjectedV
8987
return editSession;
9088
}
9189

92-
@Selection
93-
@Binding
94-
public Region selection(LocalSession localSession) {
95-
try {
96-
return localSession.getSelection();
97-
} catch (IncompleteRegionException ignore) {
98-
return null;
99-
}
100-
}
101-
10290
@Binding
10391
public RollbackDatabase database(World world) {
10492
return DBHandler.dbHandler().getDatabase(world);

worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public int set(
136136
@CommandPermissions("worldedit.region.set")
137137
@Logging(REGION)
138138
@Preload(Preload.PreloadCheck.PRELOAD)
139+
@Confirm(Confirm.Processor.REGION)
139140
public void air(Actor actor, EditSession editSession, @Selection Region region) throws WorldEditException {
140141
set(actor, editSession, region, BlockTypes.AIR);
141142
}
@@ -161,6 +162,7 @@ public void test(
161162
desc = "Get the light at a position"
162163
)
163164
@CommandPermissions("worldedit.light.fix")
165+
@Confirm(Confirm.Processor.REGION)
164166
public void fixLighting(Actor actor, LocalSession session, @Selection Region selection) throws WorldEditException {
165167
int count = FaweAPI.fixLighting(session.getSelectionWorld(), selection, null, RelightMode.ALL);
166168
actor.print(Caption.of("fawe.info.lighting.propagate.selection", count));
@@ -172,6 +174,7 @@ public void fixLighting(Actor actor, LocalSession session, @Selection Region sel
172174
desc = "Removing lighting in a selection"
173175
)
174176
@CommandPermissions("worldedit.light.remove")
177+
@Confirm(Confirm.Processor.REGION)
175178
public void removeLighting(Actor actor, LocalSession session, @Selection Region selection) {
176179
int count = FaweAPI.fixLighting(session.getSelectionWorld(), selection, null, RelightMode.NONE);
177180
actor.print(Caption.of("fawe.info.updated.lighting.selection", count));
@@ -207,6 +210,7 @@ public void nbtinfo(Player player, EditSession editSession) {
207210
desc = "Set block lighting in a selection"
208211
)
209212
@CommandPermissions("worldedit.light.set")
213+
@Confirm(Confirm.Processor.REGION)
210214
public void setlighting(Actor actor, EditSession editSession, @Selection Region region) {
211215
actor.print(Caption.of("fawe.info.light-blocks"));
212216
}
@@ -217,6 +221,7 @@ public void setlighting(Actor actor, EditSession editSession, @Selection Region
217221
desc = "Set sky lighting in a selection"
218222
)
219223
@CommandPermissions("worldedit.light.set")
224+
@Confirm(Confirm.Processor.REGION)
220225
public void setskylighting(Actor actor, @Selection Region region) {
221226
actor.print(Caption.of("fawe.info.light-blocks"));
222227
}
@@ -228,6 +233,7 @@ public void setskylighting(Actor actor, @Selection Region region) {
228233
)
229234
@CommandPermissions("worldedit.region.line")
230235
@Logging(REGION)
236+
@Confirm(Confirm.Processor.REGION)
231237
@SynchronousSettingExpected
232238
public int line(
233239
Actor actor, EditSession editSession,
@@ -376,6 +382,7 @@ public void lay(
376382
)
377383
@Logging(REGION)
378384
@CommandPermissions("worldedit.region.center")
385+
@Confirm(Confirm.Processor.REGION)
379386
@SynchronousSettingExpected
380387
public int center(
381388
Actor actor, EditSession editSession, @Selection Region region,
@@ -632,6 +639,7 @@ public void fall(
632639
)
633640
@CommandPermissions("worldedit.region.stack")
634641
@Preload(Preload.PreloadCheck.PRELOAD)
642+
@Confirm(Confirm.Processor.REGION)
635643
@SynchronousSettingExpected
636644
@Logging(ORIENTATION_REGION)
637645
public int stack(

0 commit comments

Comments
 (0)