From 97b0057ad3577bc433cc44ed44cc09263ab58f89 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 24 Nov 2018 17:52:29 +1100 Subject: SPIGOT-4500: callSyncMethod broken --- src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java | 2 +- src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java index b5c22e20..557f72d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -437,7 +437,7 @@ public class CraftScheduler implements BukkitScheduler { private static void validate(final Plugin plugin, final Object task) { Validate.notNull(plugin, "Plugin cannot be null"); Validate.notNull(task, "Task cannot be null"); - Validate.isTrue(task instanceof Runnable || task instanceof Consumer, "Task must be Runnable or Consumer"); + Validate.isTrue(task instanceof Runnable || task instanceof Consumer || task instanceof Callable, "Task must be Runnable, Consumer, or Callable"); if (!plugin.isEnabled()) { throw new IllegalPluginAccessException("Plugin attempted to register task while disabled"); } diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java index 15c62552..a85fbbb6 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -46,7 +46,7 @@ class CraftTask implements BukkitTask, Runnable { this.cTask = (Consumer) task; this.rTask = null; } else if (task == null) { - // Head task + // Head or Future task this.rTask = null; this.cTask = null; } else { -- cgit v1.2.3