mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +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/command/Command.php
View File

@ -132,7 +132,7 @@ abstract class Command{
*
* @return mixed
*/
public abstract function execute(CommandSender $sender, $commandLabel, array $args);
abstract public function execute(CommandSender $sender, $commandLabel, array $args);
/**
* @return string

2
src/pocketmine/command/PluginCommand.php
View File

@ -70,7 +70,7 @@ class PluginCommand extends Command implements PluginIdentifiableCommand{
* @param CommandExecutor $executor
*/
public function setExecutor(CommandExecutor $executor){
$this->executor = ($executor != null) ? $executor : $this->owningPlugin;
$this->executor = $executor;
}
/**