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

Some cleanup to how EntityInventoryChangeEvents are handled

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-09-20 10:13:05 +01:00
parent f0755d1659
commit 38e11aae5e
3 changed files with 66 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pocketmine/inventory/BaseInventory.php
View File

@ -23,8 +23,6 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use pocketmine\entity\Entity;
use pocketmine\event\entity\EntityInventoryChangeEvent;
use pocketmine\event\inventory\InventoryOpenEvent;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
@ -128,6 +126,10 @@ abstract class BaseInventory implements Inventory{
$this->sendContents($this->getViewers());
}
protected function doSetItemEvents(int $index, Item $newItem) : ?Item{
return $newItem;
}
public function setItem(int $index, Item $item, bool $send = true) : bool{
if($item->isNull()){
$item = ItemFactory::get(Item::AIR, 0, 0);
@ -135,17 +137,13 @@ abstract class BaseInventory implements Inventory{
$item = clone $item;
}
$holder = $this->getHolder();
if($holder instanceof Entity){
Server::getInstance()->getPluginManager()->callEvent($ev = new EntityInventoryChangeEvent($holder, $this->getItem($index), $item, $index));
if($ev->isCancelled()){
return false;
}
$item = $ev->getNewItem();
$newItem = $this->doSetItemEvents($index, $item);
if($newItem === null){
return false;
}
$old = $this->getItem($index);
$this->slots[$index] = $item->isNull() ? null : $item;
$this->slots[$index] = $newItem->isNull() ? null : $newItem;
$this->onSlotChange($index, $old, $send);
return true;