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

PlayerBlockPickEvent: pre-cancel the event when picking would fail in survival

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-25 16:30:07 +01:00
parent edccce1419
commit c19c42a934
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/player/Player.php
View File

@ -1769,17 +1769,20 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
$item = $block->getPickedItem($addTileNBT); $item = $block->getPickedItem($addTileNBT);
$ev = new PlayerBlockPickEvent($this, $block, $item); $ev = new PlayerBlockPickEvent($this, $block, $item);
$existingSlot = $this->inventory->first($item);
if($existingSlot === -1 and $this->hasFiniteResources()){
$ev->setCancelled();
}
$ev->call(); $ev->call();
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){
$existing = $this->inventory->first($item); if($existingSlot !== -1){
if($existing !== -1){ if($existingSlot < $this->inventory->getHotbarSize()){
if($existing < $this->inventory->getHotbarSize()){ $this->inventory->setHeldItemIndex($existingSlot);
$this->inventory->setHeldItemIndex($existing);
}else{ }else{
$this->inventory->swap($this->inventory->getHeldItemIndex(), $existing); $this->inventory->swap($this->inventory->getHeldItemIndex(), $existingSlot);
} }
}elseif(!$this->hasFiniteResources()){ //TODO: plugins won't know this isn't going to execute }else{
$firstEmpty = $this->inventory->firstEmpty(); $firstEmpty = $this->inventory->firstEmpty();
if($firstEmpty === -1){ //full inventory if($firstEmpty === -1){ //full inventory
$this->inventory->setItemInHand($item); $this->inventory->setItemInHand($item);