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

Fixed some inventory events not firing on players

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-11-02 13:26:58 +01:00
parent da4334f06b
commit 75c0d8324c
4 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/pocketmine/inventory/PlayerInventory.php
View File

@ -23,6 +23,7 @@ namespace pocketmine\inventory;
use pocketmine\entity\Human;
use pocketmine\event\entity\EntityArmorChangeEvent;
use pocketmine\event\entity\EntityInventoryChangeEvent;
use pocketmine\event\player\PlayerItemHeldEvent;
use pocketmine\item\Item;
use pocketmine\network\protocol\ContainerSetContentPacket;
@ -200,6 +201,8 @@ class PlayerInventory extends BaseInventory{
public function setItem($index, Item $item, $source = null){
if($index < 0 or $index >= $this->size){
return false;
}elseif($item->getID() === 0){
$this->clear($index, $source);
}
if($index >= $this->getSize()){ //Armor change
@ -211,15 +214,21 @@ class PlayerInventory extends BaseInventory{
return false;
}
$item = $ev->getNewItem();
}else{
Server::getInstance()->getPluginManager()->callEvent($ev = new EntityInventoryChangeEvent($this->getHolder(), $this->getItem($index), $item, $index));
if($ev->isCancelled()){
$this->sendArmorContents($this->getViewers());
$this->sendContents($this->getViewers());
return false;
}
$item = $ev->getNewItem();
}
if($item->getID() === 0){
$this->clear($index, $source);
}else{
$old = $this->getItem($index);
$this->slots[$index] = clone $item;
$this->onSlotChange($index, $old, $source);
}
$old = $this->getItem($index);
$this->slots[$index] = clone $item;
$this->onSlotChange($index, $old, $source);
return true;
}
@ -234,7 +243,16 @@ class PlayerInventory extends BaseInventory{
$this->sendArmorContents($this->getViewers());
$this->sendContents($this->getViewers());
return;
return false;
}
$item = $ev->getNewItem();
}else{
Server::getInstance()->getPluginManager()->callEvent($ev = new EntityInventoryChangeEvent($this->getHolder(), $old, $item, $index));
if($ev->isCancelled()){
$this->sendArmorContents($this->getViewers());
$this->sendContents($this->getViewers());
return false;
}
$item = $ev->getNewItem();
}
@ -246,6 +264,8 @@ class PlayerInventory extends BaseInventory{
$this->onSlotChange($index, $old, $source);
}
return true;
}
/**