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

Player: Stop abusing getItemInHand() when we already have it stored

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-12-10 17:08:56 +00:00
parent 2e62c084a4
commit 44e06f6a32
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/Player.php
View File

@ -2485,8 +2485,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
return true; return true;
}elseif($this->inventory->getItemInHand()->getId() === Item::BUCKET and $this->inventory->getItemInHand()->getDamage() === 1){ //Milk! }elseif($slot->getId() === Item::BUCKET and $slot->getDamage() === 1){ //Milk!
$this->server->getPluginManager()->callEvent($ev = new PlayerItemConsumeEvent($this, $this->inventory->getItemInHand())); $this->server->getPluginManager()->callEvent($ev = new PlayerItemConsumeEvent($this, $slot));
if($ev->isCancelled()){ if($ev->isCancelled()){
$this->inventory->sendContents($this); $this->inventory->sendContents($this);
@ -2494,7 +2494,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
if($this->isSurvival()){ if($this->isSurvival()){
$slot = $this->inventory->getItemInHand();
--$slot->count; --$slot->count;
$this->inventory->setItemInHand($slot); $this->inventory->setItemInHand($slot);
$this->inventory->addItem(ItemFactory::get(Item::BUCKET, 0, 1)); $this->inventory->addItem(ItemFactory::get(Item::BUCKET, 0, 1));