mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 22:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Moved getNetworkType() to ContainerInventory since it's not used anywhere else

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-09-19 19:57:22 +01:00
parent 1fb6d12a6b
commit 90fb3c5e12
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/inventory/BaseInventory.php
View File

@ -70,14 +70,6 @@ abstract class BaseInventory implements Inventory{
return $this->title;
}
/**
* Returns the Minecraft PE inventory type used to show the inventory window to clients.
* @return int
*/
public function getNetworkType() : int{
return ContainerIds::NONE;
}
/**
* Returns the size of the inventory.
* @return int

6
src/pocketmine/inventory/ContainerInventory.php
View File

@ -54,4 +54,10 @@ abstract class ContainerInventory extends BaseInventory{
$who->dataPacket($pk);
parent::onClose($who);
}
/**
* Returns the Minecraft PE inventory type used to show the inventory window to clients.
* @return int
*/
abstract public function getNetworkType() : int;
}

6
src/pocketmine/inventory/PlayerCursorInventory.php
View File

@ -24,8 +24,6 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use pocketmine\network\mcpe\protocol\InventorySlotPacket;
use pocketmine\network\mcpe\protocol\types\ContainerIds;
use pocketmine\network\mcpe\protocol\types\WindowTypes;
use pocketmine\Player;
class PlayerCursorInventory extends BaseInventory{
@ -48,10 +46,6 @@ class PlayerCursorInventory extends BaseInventory{
throw new \BadMethodCallException("Cursor can only carry one item at a time");
}
public function getNetworkType() : int{
return WindowTypes::INVENTORY; //This should never be spawned to clients
}
/**
* This override is here for documentation and code completion purposes only.
* @return Player

5
src/pocketmine/inventory/PlayerInventory.php
View File

@ -35,7 +35,6 @@ use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
use pocketmine\network\mcpe\protocol\PlayerHotbarPacket;
use pocketmine\network\mcpe\protocol\types\ContainerIds;
use pocketmine\network\mcpe\protocol\types\WindowTypes;
use pocketmine\Player;
use pocketmine\Server;
@ -54,10 +53,6 @@ class PlayerInventory extends BaseInventory{
parent::__construct($player);
}
public function getNetworkType() : int{
return WindowTypes::INVENTORY;
}
public function getName() : string{
return "Player";
}