mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-05 09:39:56 +00:00
Code Issues Projects Releases Wiki Activity

InventoryManager: move add/remove logic to separate functions

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-02-12 17:36:29 +00:00
parent 55e3b9ed91
commit 95eddbdd74
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/network/mcpe/InventoryManager.php
View File

@ -68,9 +68,17 @@ class InventoryManager{
$this->player = $player; $this->player = $player;
$this->session = $session; $this->session = $session;
$this->windowMap[ContainerIds::INVENTORY] = $this->player->getInventory(); $this->add(ContainerIds::INVENTORY, $this->player->getInventory());
$this->windowMap[ContainerIds::ARMOR] = $this->player->getArmorInventory(); $this->add(ContainerIds::ARMOR, $this->player->getArmorInventory());
$this->windowMap[ContainerIds::UI] = $this->player->getCursorInventory(); $this->add(ContainerIds::UI, $this->player->getCursorInventory());
}
private function add(int $id, Inventory $inventory) : void{
$this->windowMap[$id] = $inventory;
}
private function remove(int $id) : void{
unset($this->windowMap[$id], $this->initiatedSlotChanges[$id]);
} }
public function getWindowId(Inventory $inventory) : ?int{ public function getWindowId(Inventory $inventory) : ?int{
@ -96,7 +104,7 @@ class InventoryManager{
public function onCurrentWindowChange(Inventory $inventory) : void{ public function onCurrentWindowChange(Inventory $inventory) : void{
$this->onCurrentWindowRemove(); $this->onCurrentWindowRemove();
$this->windowMap[$this->lastInventoryNetworkId = max(ContainerIds::FIRST, ($this->lastInventoryNetworkId + 1) % ContainerIds::LAST)] = $inventory; $this->add($this->lastInventoryNetworkId = max(ContainerIds::FIRST, ($this->lastInventoryNetworkId + 1) % ContainerIds::LAST), $inventory);
$pk = $this->createContainerOpen($this->lastInventoryNetworkId, $inventory); $pk = $this->createContainerOpen($this->lastInventoryNetworkId, $inventory);
if($pk !== null){ if($pk !== null){
@ -131,16 +139,14 @@ class InventoryManager{
public function onCurrentWindowRemove() : void{ public function onCurrentWindowRemove() : void{
if(isset($this->windowMap[$this->lastInventoryNetworkId])){ if(isset($this->windowMap[$this->lastInventoryNetworkId])){
unset($this->windowMap[$this->lastInventoryNetworkId]); $this->remove($this->lastInventoryNetworkId);
unset($this->initiatedSlotChanges[$this->lastInventoryNetworkId]);
$this->session->sendDataPacket(ContainerClosePacket::create($this->lastInventoryNetworkId)); $this->session->sendDataPacket(ContainerClosePacket::create($this->lastInventoryNetworkId));
} }
} }
public function onClientRemoveWindow(int $id) : void{ public function onClientRemoveWindow(int $id) : void{
if($id === $this->lastInventoryNetworkId){ if($id === $this->lastInventoryNetworkId){
unset($this->windowMap[$id]); $this->remove($id);
unset($this->initiatedSlotChanges[$id]);
$this->player->removeCurrentWindow(); $this->player->removeCurrentWindow();
}else{ }else{
$this->session->getLogger()->debug("Attempted to close inventory with network ID $id, but current is $this->lastInventoryNetworkId"); $this->session->getLogger()->debug("Attempted to close inventory with network ID $id, but current is $this->lastInventoryNetworkId");