PR feedback

Author: me4502

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java

@@ -133,15 +133,19 @@ public SessionKey getSessionKey() {
             private volatile boolean active = true;
 
             private void updateActive() {
-                Block block = sender.getBlock();
-                if (!block.getWorld().isChunkLoaded(block.getX() >> 4, block.getZ() >> 4)) {
-                    active = false;
-                    return;
+                try {
+                    Block block = sender.getBlock();
+                    if (!block.getWorld().isChunkLoaded(block.getX() >> 4, block.getZ() >> 4)) {
+                        active = false;
+                        return;
+                    }
+                    Material type = block.getType();
+                    active = type == Material.COMMAND_BLOCK
+                        || type == Material.CHAIN_COMMAND_BLOCK
+                        || type == Material.REPEATING_COMMAND_BLOCK;
+                } catch (Throwable t) {
+                    WorldEdit.logger.warn("Exception while updating command block sender active state", t);
                 }
-                Material type = block.getType();
-                active = type == Material.COMMAND_BLOCK
-                    || type == Material.CHAIN_COMMAND_BLOCK
-                    || type == Material.REPEATING_COMMAND_BLOCK;
             }
 
             @Override
@@ -158,13 +162,7 @@ public boolean isActive() {
                         updateActive();
                     } else {
                         // We need to delegate to the right thread.
-                        Bukkit.getRegionScheduler().execute(plugin, sender.getBlock().getLocation(), () -> {
-                            try {
-                                updateActive();
-                            } catch (Throwable t) {
-                                WorldEdit.logger.warn("Exception while updating command block sender active state", t);
-                            }
-                        });
+                        Bukkit.getRegionScheduler().execute(plugin, sender.getBlock().getLocation(), this::updateActive);
                     }
 
                     return active;
@@ -177,15 +175,10 @@ public boolean isActive() {
                     // we should update it eventually
                     // Suppress FutureReturnValueIgnored: We handle it in the block.
                     @SuppressWarnings({"FutureReturnValueIgnored", "unused"})
-                    var unused = Bukkit.getScheduler().callSyncMethod(plugin,
-                            () -> {
-                                try {
-                                    updateActive();
-                                } catch (Throwable t) {
-                                    WorldEdit.logger.warn("Exception while updating command block sender active state", t);
-                                }
-                                return null;
-                            });
+                    var unused = Bukkit.getScheduler().callSyncMethod(plugin, () -> {
+                        updateActive();
+                        return null;
+                    });
                 }
                 return active;
             }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java

@@ -123,9 +123,9 @@ public void reload() {
     public int schedule(long delay, long period, Runnable task) {
         if (plugin.isFolia()) {
             Bukkit.getGlobalRegionScheduler().runAtFixedRate(plugin, scheduledTask -> task.run(), delay, period);
-            // TODO Paper doesn't appear to have a concept of task IDs, so return -1 here for now.
+            // TODO Paper doesn't appear to have a concept of task IDs, so return 1 here for now.
             //  We may want to store these tasks and map them to our own IDs to cancel them later.
-            return -1;
+            return 1;
         } else {
             return Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, task, delay, period);
         }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -534,6 +534,7 @@ BukkitImplAdapter getBukkitImplAdapter() {
             }
         } catch (Throwable t) {
             // Ignore, this likely means an outdated version.
+            LOGGER.warn("Failed to check if server is running Folia", t);
         }
 
         return false;