Remove PluginIdentifiableCommand in favour of a more generic PluginOwned interface

This commit is contained in:
Dylan K. Taylor
2020-05-11 19:25:52 +01:00
parent 6b037d6a4c
commit 3238b4ff33
6 changed files with 60 additions and 21 deletions

View File

@@ -25,11 +25,11 @@ namespace pocketmine\command;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\plugin\Plugin;
use pocketmine\plugin\PluginOwned;
use pocketmine\plugin\PluginOwnedTrait;
class PluginCommand extends Command implements PluginIdentifiableCommand{
/** @var Plugin */
private $owningPlugin;
class PluginCommand extends Command implements PluginOwned{
use PluginOwnedTrait;
/** @var CommandExecutor */
private $executor;
@@ -67,8 +67,4 @@ class PluginCommand extends Command implements PluginIdentifiableCommand{
public function setExecutor(CommandExecutor $executor) : void{
$this->executor = $executor;
}
public function getPlugin() : Plugin{
return $this->owningPlugin;
}
}

View File

@@ -1,31 +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/
*
*
*/
declare(strict_types=1);
namespace pocketmine\command;
use pocketmine\plugin\Plugin;
interface PluginIdentifiableCommand{
public function getPlugin() : Plugin;
}