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

Remove InventoryEventProcessor, use closures instead

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-12-04 19:02:26 +00:00
parent 05e968d9fd
commit b50e29085e
8 changed files with 44 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/pocketmine/entity/Human.php
View File

@ -26,11 +26,12 @@ namespace pocketmine\entity;
use pocketmine\entity\projectile\ProjectileSource;
use pocketmine\entity\utils\ExperienceUtils;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\EntityInventoryChangeEvent;
use pocketmine\event\entity\EntityRegainHealthEvent;
use pocketmine\event\player\PlayerExhaustEvent;
use pocketmine\event\player\PlayerExperienceChangeEvent;
use pocketmine\inventory\EnderChestInventory;
use pocketmine\inventory\EntityInventoryEventProcessor;
use pocketmine\inventory\Inventory;
use pocketmine\inventory\InventoryHolder;
use pocketmine\inventory\PlayerInventory;
use pocketmine\item\Consumable;
@ -613,8 +614,8 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$inventoryTag = $nbt->getListTag("Inventory");
if($inventoryTag !== null){
$armorListener = $this->armorInventory->getEventProcessor();
$this->armorInventory->setEventProcessor(null);
$armorListener = $this->armorInventory->getSlotChangeListener();
$this->armorInventory->setSlotChangeListener(null);
/** @var CompoundTag $item */
foreach($inventoryTag as $i => $item){
@ -628,7 +629,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
}
}
$this->armorInventory->setEventProcessor($armorListener);
$this->armorInventory->setSlotChangeListener($armorListener);
}
$enderChestInventoryTag = $nbt->getListTag("EnderChestInventory");
@ -641,7 +642,15 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$this->inventory->setHeldItemIndex($nbt->getInt("SelectedInventorySlot", 0), false);
$this->inventory->setEventProcessor(new EntityInventoryEventProcessor($this));
$this->inventory->setSlotChangeListener(function(Inventory $inventory, int $slot, Item $oldItem, Item $newItem) : ?Item{
$ev = new EntityInventoryChangeEvent($this, $oldItem, $newItem, $slot);
$ev->call();
if($ev->isCancelled()){
return null;
}
return $ev->getNewItem();
});
$this->setFood((float) $nbt->getInt("foodLevel", (int) $this->getFood(), true));
$this->setExhaustion($nbt->getFloat("foodExhaustionLevel", $this->getExhaustion(), true));

13
src/pocketmine/entity/Living.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\entity;
use pocketmine\block\Block;
use pocketmine\event\entity\EntityArmorChangeEvent;
use pocketmine\event\entity\EntityDamageByChildEntityEvent;
use pocketmine\event\entity\EntityDamageByEntityEvent;
use pocketmine\event\entity\EntityDamageEvent;
@ -31,7 +32,7 @@ use pocketmine\event\entity\EntityDeathEvent;
use pocketmine\event\entity\EntityEffectAddEvent;
use pocketmine\event\entity\EntityEffectRemoveEvent;
use pocketmine\inventory\ArmorInventory;
use pocketmine\inventory\ArmorInventoryEventProcessor;
use pocketmine\inventory\Inventory;
use pocketmine\item\Armor;
use pocketmine\item\Consumable;
use pocketmine\item\Durable;
@ -79,7 +80,15 @@ abstract class Living extends Entity implements Damageable{
$this->armorInventory = new ArmorInventory($this);
//TODO: load/save armor inventory contents
$this->armorInventory->setEventProcessor(new ArmorInventoryEventProcessor($this));
$this->armorInventory->setSlotChangeListener(function(Inventory $inventory, int $slot, Item $oldItem, Item $newItem) : ?Item{
$ev = new EntityArmorChangeEvent($this, $oldItem, $newItem, $slot);
$ev->call();
if($ev->isCancelled()){
return null;
}
return $ev->getNewItem();
});
$health = $this->getMaxHealth();