mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 16:51:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.0' into release/3.1

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-05 17:43:11 +01:00
commit b90d7d1839
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/inventory/DoubleChestInventory.php
View File

@ -64,7 +64,12 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{
}
public function setItem(int $index, Item $item, bool $send = true) : bool{
return $index < $this->left->getSize() ? $this->left->setItem($index, $item, $send) : $this->right->setItem($index - $this->left->getSize(), $item, $send);
$old = $this->getItem($index);
if($index < $this->left->getSize() ? $this->left->setItem($index, $item, $send) : $this->right->setItem($index - $this->left->getSize(), $item, $send)){
$this->onSlotChange($index, $old, $send);
return true;
}
return false;
}
public function getContents(bool $includeEmpty = false) : array{

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

@ -113,10 +113,14 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
$pair->checkPairing();
}
if($this->doubleInventory === null){
if(($pair->x + ($pair->z << 15)) > ($this->x + ($this->z << 15))){ //Order them correctly
$this->doubleInventory = new DoubleChestInventory($pair, $this);
if($pair->doubleInventory !== null){
$this->doubleInventory = $pair->doubleInventory;
}else{
$this->doubleInventory = new DoubleChestInventory($this, $pair);
if(($pair->x + ($pair->z << 15)) > ($this->x + ($this->z << 15))){ //Order them correctly
$this->doubleInventory = new DoubleChestInventory($pair, $this);
}else{
$this->doubleInventory = new DoubleChestInventory($this, $pair);
}
}
}
}else{