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

Removed @deprecated classes, methods and properties, added some type hints

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-09-12 17:10:11 +02:00
parent 29a5012c02
commit 3ffdb8e552
39 changed files with 166 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/scheduler/AsyncPool.php
View File

@ -150,10 +150,8 @@ class AsyncPool{
$this->removeTask($task);
}elseif($task->isTerminated()){
$info = $task->getTerminationInfo();
$this->removeTask($task, true);
$this->server->getLogger()->critical("Could not execute asynchronous task " . (new \ReflectionClass($task))->getShortName() . ": " . (isset($info["message"]) ? $info["message"] : "Unknown"));
$this->server->getLogger()->critical("On ".$info["scope"].", line ".$info["line"] .", ".$info["function"]."()");
$this->server->getLogger()->critical("Could not execute asynchronous task " . (new \ReflectionClass($task))->getShortName() . ": Task crashed");
}
}

9
src/pocketmine/scheduler/AsyncTask.php
View File

@ -49,15 +49,6 @@ abstract class AsyncTask extends \Collectable{
$this->setGarbage();
}
/**
* @deprecated
*
* @return bool
*/
public function isFinished(){
return $this->isGarbage();
}
/**
* @return mixed
*/

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

@ -1,62 +0,0 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\scheduler;
/**
* Allows the creation of simple callbacks with extra data
* 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{
/** @var callable */
protected $callable;
/** @var array */
protected $args;
/**
* @param callable $callable
* @param array $args
*/
public function __construct(callable $callable, array $args = []){
$this->callable = $callable;
$this->args = $args;
$this->args[] = $this;
}
/**
* @return callable
*/
public function getCallable(){
return $this->callable;
}
public function onRun($currentTicks){
call_user_func_array($this->callable, $this->args);
}
}

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

@ -24,6 +24,7 @@ namespace pocketmine\scheduler;
use pocketmine\network\protocol\Info;
use pocketmine\Server;
use pocketmine\utils\Utils;
use pocketmine\utils\UUID;
use pocketmine\utils\VersionString;
class SendUsageTask extends AsyncTask{
@ -41,7 +42,7 @@ class SendUsageTask extends AsyncTask{
$data = [];
$data["uniqueServerId"] = $server->getServerUniqueId();
$data["uniqueMachineId"] = Utils::getMachineUniqueId();
$data["uniqueRequestId"] = Utils::dataToUUID($server->getServerUniqueId(), microtime(true));
$data["uniqueRequestId"] = UUID::fromData($server->getServerUniqueId(), microtime(true));
switch($type){
case self::TYPE_OPEN:

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

@ -21,6 +21,9 @@
namespace pocketmine\scheduler;
/**
* WARNING! Plugins that create tasks MUST extend PluginTask
*/
abstract class Task{
/** @var TaskHandler */