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

remove usage of inventory network IDs for marking permanent windows

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

14
src/pocketmine/Player.php
View File

@ -2843,7 +2843,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
$this->windows[spl_object_id($inventory)] = $cnt; $this->windows[spl_object_id($inventory)] = $cnt;
if($inventory->open($this)){ if($inventory->open($this)){
if($isPermanent){ if($isPermanent){
$this->permanentWindows[$cnt] = true; $this->permanentWindows[spl_object_id($inventory)] = true;
} }
return $cnt; return $cnt;
}else{ }else{
@ -2862,15 +2862,15 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @throws \InvalidArgumentException if trying to remove a fixed inventory window without the `force` parameter as true * @throws \InvalidArgumentException if trying to remove a fixed inventory window without the `force` parameter as true
*/ */
public function removeWindow(Inventory $inventory, bool $force = false){ public function removeWindow(Inventory $inventory, bool $force = false){
$id = $this->windows[$hash = spl_object_id($inventory)] ?? null; $objectId = spl_object_id($inventory);
if(!$force and isset($this->permanentWindows[$objectId])){
if($id !== null and !$force and isset($this->permanentWindows[$id])){ throw new \InvalidArgumentException("Cannot remove fixed window " . get_class($inventory) . " from " . $this->getName());
throw new \InvalidArgumentException("Cannot remove fixed window $id (" . get_class($inventory) . ") from " . $this->getName());
} }
$id = $this->windows[$objectId] ?? null;
if($id !== null){ if($id !== null){
$inventory->close($this); $inventory->close($this);
unset($this->windows[$hash], $this->windowIndex[$id], $this->permanentWindows[$id]); unset($this->windows[$objectId], $this->windowIndex[$id], $this->permanentWindows[$objectId]);
} }
} }
@ -2881,7 +2881,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
*/ */
public function removeAllWindows(bool $removePermanentWindows = false){ public function removeAllWindows(bool $removePermanentWindows = false){
foreach($this->windowIndex as $id => $window){ foreach($this->windowIndex as $id => $window){
if(!$removePermanentWindows and isset($this->permanentWindows[$id])){ if(!$removePermanentWindows and isset($this->permanentWindows[spl_object_id($window)])){
continue; continue;
} }