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

Fix confirmation

Browse Source
This commit is contained in:
Jesse Boyd 2019-11-24 04:08:17 +00:00
parent 913ada31fb
commit 00e0ac721f
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/Confirm.java
View File

@ -42,10 +42,11 @@ public @interface Confirm {
@Override @Override
public boolean passes(Actor actor, InjectedValueAccess context, double value) { public boolean passes(Actor actor, InjectedValueAccess context, double value) {
Region region = context.injectedValue(Key.of(Region.class, Selection.class)).orElseThrow(IncompleteRegionException::new); Region region = context.injectedValue(Key.of(Region.class, Selection.class)).orElseThrow(IncompleteRegionException::new);
BlockVector3 min = region.getMinimumPoint(); BlockVector3 pos1 = region.getMinimumPoint();
BlockVector3 max = region.getMaximumPoint(); BlockVector3 pos2 = region.getMaximumPoint();
long area = (max.getX() - min.getX()) * (max.getZ() - min.getZ() + 1) * (int) value; long area = (pos2.getX() - pos1.getX()) * (pos2.getZ() - pos1.getZ() + 1) * (long) value;
if (area > 2 << 18) { long max = 2 << 18; // TODO configurable?
if (max != -1 && area > max) {
actor.print(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.confirm.region" , min, max, getArgs(context))); actor.print(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.confirm.region" , min, max, getArgs(context)));
return confirm(actor, context); return confirm(actor, context);
} }
@ -56,7 +57,7 @@ public @interface Confirm {
@Override @Override
public boolean passes(Actor actor, InjectedValueAccess context, double value) { public boolean passes(Actor actor, InjectedValueAccess context, double value) {
int max = WorldEdit.getInstance().getConfiguration().maxRadius; int max = WorldEdit.getInstance().getConfiguration().maxRadius;
if (value > max) { if (max != -1 && value > max) {
actor.print(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.confirm.region" , value, max, getArgs(context))); actor.print(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.confirm.region" , value, max, getArgs(context)));
return Processor.confirm(actor, context); return Processor.confirm(actor, context);
} }
@ -67,7 +68,7 @@ public @interface Confirm {
@Override @Override
public boolean passes(Actor actor, InjectedValueAccess context, double value) { public boolean passes(Actor actor, InjectedValueAccess context, double value) {
int max = 50;// TODO configurable, get Key.of(Method.class) @Limit int max = 50;// TODO configurable, get Key.of(Method.class) @Limit
if (value > max) { if (max != -1 && value > max) {
actor.print(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.confirm.region" , value, max, getArgs(context))); actor.print(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.confirm.region" , value, max, getArgs(context)));
return Processor.confirm(actor, context); return Processor.confirm(actor, context);
} }