Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michael Yoo 2013-11-30 13:10:27 +10:30
commit 25cd58bd99
8 changed files with 29 additions and 7 deletions

View file

@ -419,6 +419,12 @@ class BlockAPI{
return $this->cancelAction($block, $player, false);
}
if($target->isReplaceable === true){
$block = $target;
$hand->position($block);
$face = -1;
}
if($hand->isSolid === true and $player->entity->inBlock($block)){
return $this->cancelAction($block, $player, false); //Entity in block
}