From eb8a11739ac7fd28ccdca813e18f54bbfb4c7dca Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Thu, 9 May 2024 12:48:39 +0300 Subject: [PATCH] fixed projectile cake and door hitboxes --- src/material/block/DoorBlock.php | 44 ++++++++++++++++++++++-- src/material/block/nonfull/CakeBlock.php | 6 ++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/material/block/DoorBlock.php b/src/material/block/DoorBlock.php index 01a7371e..d2ba29b0 100644 --- a/src/material/block/DoorBlock.php +++ b/src/material/block/DoorBlock.php @@ -10,10 +10,48 @@ class DoorBlock extends TransparentBlock{ parent::__construct($id, $meta, $name); $this->isSolid = false; } - + public static function updateShape(Level $level, $x, $y, $z){ + $id = $level->level->getBlockID($x, $y, $z); + StaticBlock::setBlockBounds($id, 0.0, 0.0, 0.0, 1.0, 2.0, 1.0); + $fullMeta = self::getCompositeData($level, $x, $y, $z); + switch($fullMeta & 3){ + case 0: + if(($fullMeta & 4) != 0){ + if(($fullMeta & 16) == 0) StaticBlock::setBlockBounds($id, 0, 0, 0, 1, 1, 0.1875); + else StaticBlock::setBlockBounds($id, 0, 0, 1 - 0.1875, 1, 1, 1); + }else{ + StaticBlock::setBlockBounds($id, 0, 0, 0, 0.1875, 1, 1); + } + break; + case 1: + if(($fullMeta & 4) != 0){ + if(($fullMeta & 16) == 0) StaticBlock::setBlockBounds($id, 1 - 0.1875, 0, 0, 1, 1, 1); + else StaticBlock::setBlockBounds($id, 0, 0, 0, 0.1875, 1, 1); + }else{ + StaticBlock::setBlockBounds($id, 0, 0, 0, 1, 1, 0.1875); + } + break; + case 2: + if(($fullMeta & 4) != 0){ + if(($fullMeta & 16) == 0) StaticBlock::setBlockBounds($id, 0, 0, 1 - 0.1875, 1, 1, 1); + else StaticBlock::setBlockBounds($id, 0, 0, 0, 1, 1, 0.1875); + }else{ + StaticBlock::setBlockBounds($id, 1 - 0.1875, 0, 0, 1, 1, 1); + } + break; + case 3: + if(($fullMeta & 4) != 0){ + if(($fullMeta & 16) == 0) StaticBlock::setBlockBounds($id, 0, 0, 0, 0.1875, 1, 1); + else StaticBlock::setBlockBounds($id, 1 - 0.1875, 0, 0, 1, 1, 1); + }else{ + StaticBlock::setBlockBounds($id, 0, 0, 1 - 0.1875, 1, 1, 1); + } + break; + } + } public static function getCollisionBoundingBoxes(Level $level, $x, $y, $z, Entity $entity){ $aabb = new AxisAlignedBB(0, 0, 0, 1, 2, 1); - $fullMeta = self::getFullBlockMetadata($level, $x, $y, $z); + $fullMeta = self::getCompositeData($level, $x, $y, $z); switch($fullMeta & 3){ case 0: if(($fullMeta & 4) != 0){ @@ -53,7 +91,7 @@ class DoorBlock extends TransparentBlock{ return [$aabb->offset($x, $y, $z)]; } - public static function getFullBlockMetadata(Level $level, $x, $y, $z){ + public static function getCompositeData(Level $level, $x, $y, $z){ $myMeta = $level->level->getBlockDamage($x, $y, $z); if(($myMeta & 8) != 0){ diff --git a/src/material/block/nonfull/CakeBlock.php b/src/material/block/nonfull/CakeBlock.php index ef625027..6d049dda 100644 --- a/src/material/block/nonfull/CakeBlock.php +++ b/src/material/block/nonfull/CakeBlock.php @@ -14,6 +14,12 @@ class CakeBlock extends TransparentBlock{ return [new AxisAlignedBB($x + (2*$data + 1) * 0.0625, $y, $z + 0.0625, $x + 0.9375, $y + 0.5, $z + 0.9375)]; } + public static function updateShape(Level $level, $x, $y, $z){ + [$id, $data] = $level->level->getBlock($x, $y, $z); + + StaticBlock::setBlockBounds($id, (2 * $data + 1) * 0.0625, 0.0, 0.0625, 0.9375, 0.5, 0.9375); + } + public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ $down = $this->getSide(0); if($down->getID() !== AIR){