Don't want the scheduler taking invalid arguments as well.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 664fe81d..ad07883a 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);