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

Merge changes from master

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-04-21 22:48:18 +01:00
parent 2204942338 de95046c11
commit 6ece57e23e
23 changed files with 79 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,7 @@ abstract class AsyncTask extends Collectable{
*
* @return void
*/
public abstract function onRun();
abstract public function onRun();
/**
* Actions to execute when completed (on main thread)

2
src/pocketmine/scheduler/PluginTask.php
View File

@ -41,7 +41,7 @@ abstract class PluginTask extends Task{
/**
* @return Plugin
*/
public final function getOwner(){
final public function getOwner(){
return $this->owner;
}

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

@ -32,14 +32,14 @@ abstract class Task{
/**
* @return TaskHandler
*/
public final function getHandler(){
final public function getHandler(){
return $this->taskHandler;
}
/**
* @return int
*/
public final function getTaskId(){
final public function getTaskId(){
if($this->taskHandler !== null){
return $this->taskHandler->getTaskId();
}
@ -50,7 +50,7 @@ abstract class Task{
/**
* @param TaskHandler $taskHandler
*/
public final function setHandler($taskHandler){
final public function setHandler($taskHandler){
if($this->taskHandler === null or $taskHandler === null){
$this->taskHandler = $taskHandler;
}
@ -63,7 +63,7 @@ abstract class Task{
*
* @return void
*/
public abstract function onRun($currentTick);
abstract public function onRun($currentTick);
/**
* Actions to execute if the Task is cancelled