mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Updated trigger_error to Exceptions, fixed bug in Plugin task deletion

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-05-26 12:22:28 +02:00
parent ffa3e8a0aa
commit 160c633c08
15 changed files with 127 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/scheduler/ServerScheduler.php
View File

@ -123,7 +123,8 @@ class ServerScheduler{
*/
public function cancelTasks(Plugin $plugin){
foreach($this->tasks as $taskId => $task){
if($task->getTask() instanceof PluginTask){
$ptask = $task->getTask();
if($ptask instanceof PluginTask and $ptask->getOwner() === $plugin){
$task->cancel();
unset($this->tasks[$taskId]);
}
@ -148,11 +149,18 @@ class ServerScheduler{
return isset($this->tasks[$taskId]);
}
/**
* @param Task $task
* @param $delay
* @param $period
*
* @return null|TaskHandler
*
* @throws \Exception
*/
private function addTask(Task $task, $delay, $period){
if($task instanceof PluginTask and !$task->getOwner()->isEnabled()){
trigger_error("Plugin attempted to register a task while disabled", E_USER_WARNING);
return null;
throw new \Exception("Plugin attempted to register a task while disabled");
}
if($delay <= 0){