From 0b7fd741754ed83656f00a967b36636535d1b305 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sat, 12 Apr 2025 21:14:09 +0300 Subject: [PATCH] better body placement checks --- src/API/BlockAPI.php | 13 ++++++++++--- src/material/block/nonfull/FenceBlock.php | 13 +++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/API/BlockAPI.php b/src/API/BlockAPI.php index 42a067ce..97551224 100755 --- a/src/API/BlockAPI.php +++ b/src/API/BlockAPI.php @@ -501,9 +501,16 @@ class BlockAPI{ $hand->position($block); //$face = -1; } - - if($hand->isSolid === true and $block->boundingBox->intersectsWith($player->entity->boundingBox) && ($hand->getID() != BED_BLOCK && $hand->getID() != CARPET)){ - return $this->cancelAction($block, $player, false); //Entity in block + + if($hand->isSolid === true && ($hand->getID() != BED_BLOCK && $hand->getID() != CARPET)){ + $aabb = $hand->getAABB($block->level, $block->x, $block->y, $block->z); + $playerbb = $player->entity->boundingBox; + //$aabb->intersectsWith($playerbb) is not good enough for this case + //minY+0.21 is used to stop sneaking from triggering action cancelling + if(($aabb->maxX > $playerbb->minX && $aabb->minX < $playerbb->maxX) && ($aabb->maxY > ($playerbb->minY+0.21) && $aabb->minY < $playerbb->maxY) && ($aabb->maxZ > $playerbb->minZ && $aabb->minZ < $playerbb->maxZ)){ + return $this->cancelAction($block, $player, false); //Entity in block + } + } if($this->server->api->dhandle("player.block.place", ["player" => $player, "block" => $block, "target" => $target, "item" => $item]) === false){ diff --git a/src/material/block/nonfull/FenceBlock.php b/src/material/block/nonfull/FenceBlock.php index b9ceb18b..98442208 100644 --- a/src/material/block/nonfull/FenceBlock.php +++ b/src/material/block/nonfull/FenceBlock.php @@ -17,6 +17,19 @@ class FenceBlock extends TransparentBlock{ return true; } + public static function getAABB(Level $level, $x, $y, $z){ + $v9 = self::canConnectTo($level, $x, $y, $z - 1); + $v10 = self::canConnectTo($level, $x, $y, $z + 1); + $v11 = self::canConnectTo($level, $x - 1, $y, $z); + $v12 = self::canConnectTo($level, $x + 1, $y, $z); + $minX = $v11 ? 0 : 0.375; + $minZ = $v9 ? 0 : 0.375; + $maxZ = $v10 ? 1 : 0.625; + $maxX = !$v12 ? 0.625 : 1; + StaticBlock::setBlockBounds(static::$blockID, $minX, 0, $minZ, $maxX, 1.5, $maxZ); + return parent::getAABB($level, $x, $y, $z); + } + public static function getCollisionBoundingBoxes(Level $level, $x, $y, $z, Entity $entity){ $v8 = self::canConnectTo($level, $x, $y, $z - 1); $v9 = self::canConnectTo($level, $x, $y, $z + 1);