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

Player: give some inventory vars clearer names

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-05-20 19:38:53 +01:00
parent 297ca25123
commit 1c99602a3f
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/pocketmine/Player.php
View File

@ -183,7 +183,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
/** @var PlayerInfo */ /** @var PlayerInfo */
protected $playerInfo; protected $playerInfo;
protected $windowCnt = 2; protected $lastInventoryNetworkId = 2;
/** @var int[] */ /** @var int[] */
protected $windows = []; protected $windows = [];
/** @var Inventory[] */ /** @var Inventory[] */
@ -2810,7 +2810,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* player is already viewing the specified inventory. * player is already viewing the specified inventory.
* *
* @param Inventory $inventory * @param Inventory $inventory
* @param int|null $forceId Forces a special ID for the window * @param int|null $forceNetworkId Forces a special ID for the window
* @param bool $isPermanent Prevents the window being removed if true. * @param bool $isPermanent Prevents the window being removed if true.
* *
* @return int * @return int
@ -2818,34 +2818,34 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @throws \InvalidArgumentException if a forceID which is already in use is specified * @throws \InvalidArgumentException if a forceID which is already in use is specified
* @throws \InvalidStateException if trying to add a window without forceID when no slots are free * @throws \InvalidStateException if trying to add a window without forceID when no slots are free
*/ */
public function addWindow(Inventory $inventory, ?int $forceId = null, bool $isPermanent = false) : int{ public function addWindow(Inventory $inventory, ?int $forceNetworkId = null, bool $isPermanent = false) : int{
if(($id = $this->getWindowId($inventory)) !== ContainerIds::NONE){ if(($id = $this->getWindowId($inventory)) !== ContainerIds::NONE){
return $id; return $id;
} }
if($forceId === null){ if($forceNetworkId === null){
$cnt = $this->windowCnt; $networkId = $this->lastInventoryNetworkId;
do{ do{
$cnt = max(ContainerIds::FIRST, ($cnt + 1) % ContainerIds::LAST); $networkId = max(ContainerIds::FIRST, ($networkId + 1) % ContainerIds::LAST);
if($cnt === $this->windowCnt){ //wraparound, no free slots if($networkId === $this->lastInventoryNetworkId){ //wraparound, no free slots
throw new \InvalidStateException("No free window IDs found"); throw new \InvalidStateException("No free window IDs found");
} }
}while(isset($this->windowIndex[$cnt])); }while(isset($this->windowIndex[$networkId]));
$this->windowCnt = $cnt; $this->lastInventoryNetworkId = $networkId;
}else{ }else{
$cnt = $forceId; $networkId = $forceNetworkId;
if(isset($this->windowIndex[$cnt])){ if(isset($this->windowIndex[$networkId])){
throw new \InvalidArgumentException("Requested force ID $forceId already in use"); throw new \InvalidArgumentException("Requested force ID $forceNetworkId already in use");
} }
} }
$this->windowIndex[$cnt] = $inventory; $this->windowIndex[$networkId] = $inventory;
$this->windows[spl_object_id($inventory)] = $cnt; $this->windows[spl_object_id($inventory)] = $networkId;
if($inventory->open($this)){ if($inventory->open($this)){
if($isPermanent){ if($isPermanent){
$this->permanentWindows[spl_object_id($inventory)] = true; $this->permanentWindows[spl_object_id($inventory)] = true;
} }
return $cnt; return $networkId;
}else{ }else{
$this->removeWindow($inventory); $this->removeWindow($inventory);
@ -2867,10 +2867,10 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
throw new \InvalidArgumentException("Cannot remove fixed window " . get_class($inventory) . " from " . $this->getName()); throw new \InvalidArgumentException("Cannot remove fixed window " . get_class($inventory) . " from " . $this->getName());
} }
$id = $this->windows[$objectId] ?? null; $networkId = $this->windows[$objectId] ?? null;
if($id !== null){ if($networkId !== null){
$inventory->close($this); $inventory->close($this);
unset($this->windows[$objectId], $this->windowIndex[$id], $this->permanentWindows[$objectId]); unset($this->windows[$objectId], $this->windowIndex[$networkId], $this->permanentWindows[$objectId]);
} }
} }
@ -2880,7 +2880,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @param bool $removePermanentWindows Whether to remove permanent windows. * @param bool $removePermanentWindows Whether to remove permanent windows.
*/ */
public function removeAllWindows(bool $removePermanentWindows = false){ public function removeAllWindows(bool $removePermanentWindows = false){
foreach($this->windowIndex as $id => $window){ foreach($this->windowIndex as $networkId => $window){
if(!$removePermanentWindows and isset($this->permanentWindows[spl_object_id($window)])){ if(!$removePermanentWindows and isset($this->permanentWindows[spl_object_id($window)])){
continue; continue;
} }
@ -2890,7 +2890,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
} }
public function sendAllInventories(){ public function sendAllInventories(){
foreach($this->windowIndex as $id => $inventory){ foreach($this->windowIndex as $networkId => $inventory){
$inventory->sendContents($this); $inventory->sendContents($this);
} }
} }