From ac9f297445a6116c5bb314b3be9f38520a58845e Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 18 Apr 2011 23:52:19 -0700 Subject: [PATCH] Don't want the scheduler taking invalid arguments as well. --- .../org/bukkit/craftbukkit/scheduler/CraftScheduler.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java index 664fe81db2..ad07883a1d 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -168,6 +168,10 @@ public class CraftScheduler implements BukkitScheduler, Runnable { } public int scheduleSyncRepeatingTask(Plugin plugin, Runnable task, long delay, long period) { + if (plugin == null) throw new IllegalArgumentException("Plugin can not null"); + if (task == null) throw new IllegalArgumentException("Task can not null"); + if (delay < 0) throw new IllegalArgumentException("Delay cannot be less than 0"); + CraftTask newTask = new CraftTask(plugin, task, true, getCurrentTick()+delay, period); synchronized (schedulerQueue) { schedulerQueue.put(newTask, true); @@ -185,6 +189,10 @@ public class CraftScheduler implements BukkitScheduler, Runnable { } public int scheduleAsyncRepeatingTask(Plugin plugin, Runnable task, long delay, long period) { + if (plugin == null) throw new IllegalArgumentException("Plugin can not null"); + if (task == null) throw new IllegalArgumentException("Task can not null"); + if (delay < 0) throw new IllegalArgumentException("Delay cannot be less than 0"); + CraftTask newTask = new CraftTask(plugin, task, false, getCurrentTick()+delay, period); synchronized (schedulerQueue) { schedulerQueue.put(newTask, false);