Merge branch 'stable' into next-minor

This commit is contained in:
Dylan K. Taylor
2020-04-25 12:06:52 +01:00
12 changed files with 932 additions and 208 deletions

View File

@ -1862,11 +1862,11 @@ class Level implements ChunkManager, Metadatable{
$ev->call();
if(!$ev->isCancelled()){
if(!$player->isSneaking() and $blockClicked->onActivate($item, $player)){
if((!$player->isSneaking() or $item->isNull()) and $blockClicked->onActivate($item, $player)){
return true;
}
if(!$player->isSneaking() and $item->onActivate($player, $blockReplace, $blockClicked, $face, $clickVector)){
if($item->onActivate($player, $blockReplace, $blockClicked, $face, $clickVector)){
return true;
}
}else{