Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-23 07:41:30 +01:00
Code Issues Projects Releases Wiki Activity

Wrap /rg flags in a task.

Browse Source
This commit is contained in:
wizjany 2019-05-05 00:02:24 -04:00
parent 18365bbe42
commit b27f18788c
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java
View File

@ -36,7 +36,6 @@
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.formatting.component.ErrorFormat;
import com.sk89q.worldedit.util.formatting.component.InvalidComponentException;
import com.sk89q.worldedit.util.formatting.component.LabelFormat;
import com.sk89q.worldedit.util.formatting.component.SubtleFormat;
import com.sk89q.worldedit.util.formatting.text.Component;
@ -644,13 +643,17 @@ public void flag(CommandContext args, Actor sender) throws CommandException {
// Print region information
if (args.hasFlag('h')) {
int page = args.getFlagInteger('h');
try {
final FlagHelperBox flagHelperBox = new FlagHelperBox(world, existing, permModel);
flagHelperBox.setComponentsPerPage(18);
final FlagHelperBox flagHelperBox = new FlagHelperBox(world, existing, permModel);
flagHelperBox.setComponentsPerPage(18);
ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(() -> {
sender.print(flagHelperBox.create(page));
} catch (InvalidComponentException e) {
throw new CommandException("Error creating component.", e);
}
return null;
});
AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
.registerWithSupervisor("Getting region flags.")
.sendMessageAfterDelay("(Please wait... fetching region info...)")
.thenTellErrorsOnly("Failed to fetch region info");
} else {
RegionPrintoutBuilder printout = new RegionPrintoutBuilder(world.getName(), existing, null, sender);
printout.append(SubtleFormat.wrap("(Current flags: "));
@ -677,13 +680,18 @@ public void flagHelper(CommandContext args, Actor sender) throws CommandExceptio
throw new CommandPermissionsException();
}
int page = args.getInteger(1, 1);
try {
final FlagHelperBox flagHelperBox = new FlagHelperBox(world, region, perms);
flagHelperBox.setComponentsPerPage(18);
final FlagHelperBox flagHelperBox = new FlagHelperBox(world, region, perms);
flagHelperBox.setComponentsPerPage(18);
ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(() -> {
sender.print(flagHelperBox.create(page));
} catch (InvalidComponentException e) {
throw new CommandException("Error creating component.", e);
}
return null;
});
AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
.registerWithSupervisor("Getting region flags.")
.sendMessageAfterDelay("(Please wait... fetching region info...)")
.thenTellErrorsOnly("Failed to fetch region info");
}
/**