Merged master into php7 to support 0.13.1

This commit is contained in:
Intyre
2016-01-22 17:36:45 +01:00
117 changed files with 2732 additions and 393 deletions

View File

@ -22,13 +22,14 @@
namespace pocketmine\scheduler;
use pocketmine\Server;
use pocketmine\Collectable;
/**
* Class used to run async tasks in other threads.
*
* WARNING: Do not call PocketMine-MP API methods, or save objects from/on other Threads!!
*/
abstract class AsyncTask extends \Collectable{
abstract class AsyncTask extends Collectable{
/** @var AsyncWorker $worker */
public $worker = null;