It now seems to run fine

EngineHub · Dec 21, 2018 · 02382f1 · 02382f1
1 parent 8088d0d
commit 02382f1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/WorldGuardCommands.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/WorldGuardCommands.java
@@ -138,7 +138,7 @@ public void report(CommandContext args, final Actor sender) throws CommandExcept
 
         if (args.hasFlag('p')) {
             sender.checkPermission("worldguard.report.pastebin");
-            ActorCallbackPaste.pastebin(worldGuard.getSupervisor(), sender, result, "WorldGuard report: %s.report");
+            ActorCallbackPaste.pastebin(worldGuard.getSupervisor(), sender, result, "WorldGuard report: %s.report", worldGuard.getExceptionConverter());
         }
     }
 
@@ -191,7 +191,7 @@ public void profile(final CommandContext args, final Actor sender) throws Comman
             sampler = activeSampler = builder.start();
         }
 
-        AsyncCommandHelper.wrap(sampler.getFuture(), worldGuard.getSupervisor(), sender)
+        AsyncCommandHelper.wrap(sampler.getFuture(), worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                 .formatUsing(minutes)
                 .registerWithSupervisor("Running CPU profiler for %d minute(s)...")
                 .sendMessageAfterDelay("(Please wait... profiling for %d minute(s)...)")
@@ -217,7 +217,7 @@ public void onSuccess(Sampler result) {
                 }
 
                 if (pastebin) {
-                    ActorCallbackPaste.pastebin(worldGuard.getSupervisor(), sender, output, "Profile result: %s.profile");
+                    ActorCallbackPaste.pastebin(worldGuard.getSupervisor(), sender, output, "Profile result: %s.profile", worldGuard.getExceptionConverter());
                 }
             }
 

diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/MemberCommands.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/MemberCommands.java
@@ -76,7 +76,7 @@ public void addMember(CommandContext args, Actor sender) throws CommandException
                 WorldGuard.getInstance().getExecutorService().submit(resolver),
                 resolver.createAddAllFunction(region.getMembers()));
 
-        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                 .formatUsing(region.getId(), world.getName())
                 .registerWithSupervisor("Adding members to the region '%s' on '%s'")
                 .sendMessageAfterDelay("(Please wait... querying player names...)")
@@ -137,7 +137,7 @@ public void addOwner(CommandContext args, Actor sender) throws CommandException,
                 WorldGuard.getInstance().getExecutorService().submit(resolver),
                 resolver.createAddAllFunction(region.getOwners()));
 
-        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                 .formatUsing(region.getId(), world.getName())
                 .registerWithSupervisor("Adding owners to the region '%s' on '%s'")
                 .sendMessageAfterDelay("(Please wait... querying player names...)")
@@ -184,7 +184,7 @@ public void removeMember(CommandContext args, Actor sender) throws CommandExcept
                     resolver.createRemoveAllFunction(region.getMembers()));
         }
 
-        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                 .formatUsing(region.getId(), world.getName())
                 .registerWithSupervisor("Removing members from the region '%s' on '%s'")
                 .sendMessageAfterDelay("(Please wait... querying player names...)")
@@ -231,7 +231,7 @@ public void removeOwner(CommandContext args, Actor sender) throws CommandExcepti
                     resolver.createRemoveAllFunction(region.getOwners()));
         }
 
-        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                 .formatUsing(region.getId(), world.getName())
                 .registerWithSupervisor("Removing owners from the region '%s' on '%s'")
                 .sendMessageAfterDelay("(Please wait... querying player names...)")

diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java
@@ -131,7 +131,7 @@ public void define(CommandContext args, Actor sender) throws CommandException {
         task.addOwnersFromCommand(args, 2);
         ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(task);
 
-        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), player)
+        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), player, worldGuard.getExceptionConverter())
                 .formatUsing(id)
                 .registerWithSupervisor("Adding the region '%s'...")
                 .sendMessageAfterDelay("(Please wait... adding '%s'...)")
@@ -183,7 +183,7 @@ public void redefine(CommandContext args, Actor sender) throws CommandException
         RegionAdder task = new RegionAdder(manager, region);
         ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(task);
 
-        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), player)
+        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), player, worldGuard.getExceptionConverter())
                 .formatUsing(id)
                 .registerWithSupervisor("Updating the region '%s'...")
                 .sendMessageAfterDelay("(Please wait... updating '%s'...)")
@@ -284,7 +284,7 @@ public void claim(CommandContext args, Actor sender) throws CommandException {
         task.setOwnersInput(new String[]{player.getName()});
         ListenableFuture<?> future = worldGuard.getExecutorService().submit(task);
 
-        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), player)
+        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), player, worldGuard.getExceptionConverter())
                 .formatUsing(id)
                 .registerWithSupervisor("Claiming the region '%s'...")
                 .sendMessageAfterDelay("(Please wait... claiming '%s'...)")
@@ -439,7 +439,7 @@ public void list(CommandContext args, Actor sender) throws CommandException {
 
         ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(task);
 
-        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+        AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                 .registerWithSupervisor("Getting list of regions...")
                 .sendMessageAfterDelay("(Please wait... fetching region list...)")
                 .thenTellErrorsOnly("Failed to fetch region list");
@@ -743,7 +743,7 @@ public void remove(CommandContext args, Actor sender) throws CommandException {
             task.setRemovalStrategy(RemovalStrategy.UNSET_PARENT_IN_CHILDREN);
         }
 
-        AsyncCommandHelper.wrap(WorldGuard.getInstance().getExecutorService().submit(task), worldGuard.getSupervisor(), sender)
+        AsyncCommandHelper.wrap(WorldGuard.getInstance().getExecutorService().submit(task), worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                 .formatUsing(existing.getId())
                 .registerWithSupervisor("Removing the region '%s'...")
                 .sendMessageAfterDelay("(Please wait... removing '%s'...)")
@@ -787,7 +787,7 @@ public void load(CommandContext args, final Actor sender) throws CommandExceptio
 
             ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(new RegionManagerReloader(manager));
 
-            AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+            AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                     .forRegionDataLoad(world, false);
         } else {
             // Load regions for all worlds
@@ -802,7 +802,7 @@ public void load(CommandContext args, final Actor sender) throws CommandExceptio
 
             ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(new RegionManagerReloader(managers));
 
-            AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+            AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                     .registerWithSupervisor("Loading regions for all worlds")
                     .sendMessageAfterDelay("(Please wait... loading region data for all worlds...)")
                     .thenRespondWith(
@@ -846,7 +846,7 @@ public void save(CommandContext args, final Actor sender) throws CommandExceptio
 
             ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(new RegionManagerSaver(manager));
 
-            AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+            AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                     .forRegionDataSave(world, false);
         } else {
             // Save for all worlds
@@ -861,7 +861,7 @@ public void save(CommandContext args, final Actor sender) throws CommandExceptio
 
             ListenableFuture<?> future = WorldGuard.getInstance().getExecutorService().submit(new RegionManagerSaver(managers));
 
-            AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender)
+            AsyncCommandHelper.wrap(future, worldGuard.getSupervisor(), sender, worldGuard.getExceptionConverter())
                     .registerWithSupervisor("Saving regions for all worlds")
                     .sendMessageAfterDelay("(Please wait... saving region data for all worlds...)")
                     .thenRespondWith(

diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java
@@ -95,7 +95,8 @@ private <T extends Event & CancelLogging> void testEvent(CommandSender receiver,
 
             plugin.checkPermission(receiver, "worldguard.debug.pastebin");
             ActorCallbackPaste
-                    .pastebin(WorldGuard.getInstance().getSupervisor(), plugin.wrapCommandSender(receiver), result, "Event debugging report: %s.txt");
+                    .pastebin(WorldGuard.getInstance().getSupervisor(), plugin.wrapCommandSender(receiver), result,
+                            "Event debugging report: %s.txt", WorldGuard.getInstance().getExceptionConverter());
         } else {
             receiver.sendMessage(result.replaceAll("(?m)^", ChatColor.AQUA.toString()));