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

Deprecated CallbackTask, moved sleep checking to level

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-04-25 17:28:30 +02:00
parent 1d8c29add7
commit 7ad98d4659
6 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/scheduler/CallbackTask.php
View File

@ -26,6 +26,9 @@ namespace pocketmine\scheduler;
* The last parameter in the callback will be this object
*
* If you want to do a task in a Plugin, consider extending PluginTask to your needs
*
* @deprecated
*
*/
class CallbackTask extends Task{

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

@ -189,6 +189,18 @@ class ServerScheduler{
}elseif(!$task->getOwner()->isEnabled()){
throw new PluginException("Plugin '" . $task->getOwner()->getName() . "' attempted to register a task while disabled");
}
}elseif($task instanceof CallbackTask and Server::getInstance()->getProperty("settings.deprecated-verbose", true)){
$callable = $task->getCallable();
if(is_array($callable)){
if(is_object($callable[0])){
$taskName = "Callback#" . get_class($callable[0]) . "::" . $callable[1];
}else{
$taskName = "Callback#" . $callable[0] . "::" . $callable[1];
}
}else{
$taskName = "Callback#" . $callable;
}
Server::getInstance()->getLogger()->warning("A plugin attempted to register a deprecated CallbackTask ($taskName)");
}
if($delay <= 0){
@ -201,22 +213,7 @@ class ServerScheduler{
$period = 1;
}
if($task instanceof CallbackTask){
$callable = $task->getCallable();
if(is_array($callable)){
if(is_object($callable[0])){
$taskName = "Callback#" . get_class($callable[0]) . "::" . $callable[1];
}else{
$taskName = "Callback#" . $callable[0] . "::" . $callable[1];
}
}else{
$taskName = "Callback#" . $callable;
}
}else{
$taskName = get_class($task);
}
return $this->handle(new TaskHandler($taskName, $task, $this->nextId(), $delay, $period));
return $this->handle(new TaskHandler(get_class($task), $task, $this->nextId(), $delay, $period));
}
private function handle(TaskHandler $handler){