mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-18 19:55:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '34a3e0d'

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-04-25 12:13:03 +01:00
commit a178a14732
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/world/World.php
View File

@ -1550,15 +1550,13 @@ class World implements ChunkManager{
$ev = new PlayerInteractEvent($player, $item, $blockClicked, $clickVector, $face, PlayerInteractEvent::RIGHT_CLICK_BLOCK); $ev = new PlayerInteractEvent($player, $item, $blockClicked, $clickVector, $face, PlayerInteractEvent::RIGHT_CLICK_BLOCK);
$ev->call(); $ev->call();
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){
if(!$player->isSneaking() and $blockClicked->onInteract($item, $face, $clickVector, $player)){ if((!$player->isSneaking() or $item->isNull()) and $blockClicked->onInteract($item, $face, $clickVector, $player)){
return true; return true;
} }
if(!$player->isSneaking()){ $result = $item->onActivate($player, $blockReplace, $blockClicked, $face, $clickVector);
$result = $item->onActivate($player, $blockReplace, $blockClicked, $face, $clickVector); if(!$result->equals(ItemUseResult::NONE())){
if(!$result->equals(ItemUseResult::NONE())){ return $result->equals(ItemUseResult::SUCCESS());
return $result->equals(ItemUseResult::SUCCESS());
}
} }
}else{ }else{
return false; return false;