From e97139919a4c484826c0dceca370489c00c97bd9 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Mon, 28 Jul 2014 20:24:35 +0200
Subject: [PATCH] Added new exception when a plugin creates an orphaned
 PluginTask

---
 src/pocketmine/scheduler/ServerScheduler.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pocketmine/scheduler/ServerScheduler.php b/src/pocketmine/scheduler/ServerScheduler.php
index 4ddfa381c..4e9fc997f 100644
--- a/src/pocketmine/scheduler/ServerScheduler.php
+++ b/src/pocketmine/scheduler/ServerScheduler.php
@@ -166,8 +166,12 @@ class ServerScheduler{
 	 * @throws \Exception
 	 */
 	private function addTask(Task $task, $delay, $period){
-		if($task instanceof PluginTask and !$task->getOwner()->isEnabled()){
-			throw new \Exception("Plugin attempted to register a task while disabled");
+		if($task instanceof PluginTask){
+			if(!($task->getOwner() instanceof Plugin)){
+				throw new \Exception("Invalid owner of PluginTask ".get_class($task));
+			}elseif(!$task->getOwner()->isEnabled()){
+				throw new \Exception("Plugin '".$task->getOwner()->getName()."' attempted to register a task while disabled");
+			}
 		}
 
 		if($delay <= 0){