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

Fixed double chest tile memory leak on shutdown, close #256 (#261)

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-01-15 19:41:15 +00:00 committed by GitHub
parent bcf049a660
commit 9869aaa46a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/tile/Chest.php
View File

@ -40,6 +40,9 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
/** @var DoubleChestInventory */ /** @var DoubleChestInventory */
protected $doubleInventory = null; protected $doubleInventory = null;
/** @var bool */
private $hasClosedPair = false;
public function __construct(Chunk $chunk, CompoundTag $nbt){ public function __construct(Chunk $chunk, CompoundTag $nbt){
parent::__construct($chunk, $nbt); parent::__construct($chunk, $nbt);
$this->inventory = new ChestInventory($this); $this->inventory = new ChestInventory($this);
@ -56,6 +59,10 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
public function close(){ public function close(){
if($this->closed === false){ if($this->closed === false){
if($this->isPaired()){
$this->getPair()->hasClosedPair = true;
}
foreach($this->getInventory()->getViewers() as $player){ foreach($this->getInventory()->getViewers() as $player){
$player->removeWindow($this->getInventory()); $player->removeWindow($this->getInventory());
} }
@ -198,7 +205,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
} }
public function isPaired(){ public function isPaired(){
if(!isset($this->namedtag->pairx) or !isset($this->namedtag->pairz)){ if(!isset($this->namedtag->pairx) or !isset($this->namedtag->pairz) or $this->hasClosedPair){
return false; return false;
} }