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

fix collision detection not detecting fence & fence-gate, fixed nether-brick fence gate AABB, close #1299

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-09-29 15:27:14 +01:00
parent a33be643c4
commit 27798c69ee
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/block/Fence.php
View File

@ -85,11 +85,10 @@ class Fence extends Transparent{
} }
public function canConnect(Block $block){ public function canConnect(Block $block){
return ($block instanceof Fence or $block instanceof FenceGate) ? true : $block->isSolid() and !$block->isTransparent(); return $block instanceof Fence or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
} }
public function getFuelTime() : int{ public function getFuelTime() : int{
return 300; return 300;
} }
} }

19
src/pocketmine/block/NetherBrickFence.php
View File

@ -25,6 +25,8 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
class NetherBrickFence extends Transparent{ class NetherBrickFence extends Transparent{
@ -46,8 +48,21 @@ class NetherBrickFence extends Transparent{
return "Nether Brick Fence"; return "Nether Brick Fence";
} }
protected function recalculateBoundingBox(){
$width = 0.375;
return new AxisAlignedBB(
$this->x + ($this->canConnect($this->getSide(Vector3::SIDE_WEST)) ? 0 : $width),
$this->y,
$this->z + ($this->canConnect($this->getSide(Vector3::SIDE_NORTH)) ? 0 : $width),
$this->x + 1 - ($this->canConnect($this->getSide(Vector3::SIDE_EAST)) ? 0 : $width),
$this->y + 1.5,
$this->z + 1 - ($this->canConnect($this->getSide(Vector3::SIDE_SOUTH)) ? 0 : $width)
);
}
public function canConnect(Block $block){ public function canConnect(Block $block){
return ($block instanceof NetherBrickFence) or ($block->isSolid() and !$block->isTransparent()); return $block instanceof NetherBrickFence or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
} }
public function getDrops(Item $item) : array{ public function getDrops(Item $item) : array{
@ -57,6 +72,4 @@ class NetherBrickFence extends Transparent{
return []; return [];
} }
//TODO: fix bounding boxes
} }

26
src/pocketmine/level/Level.php
View File

@ -1094,12 +1094,13 @@ class Level implements ChunkManager, Metadatable{
* @return Block[] * @return Block[]
*/ */
public function getCollisionBlocks(AxisAlignedBB $bb, bool $targetFirst = false) : array{ public function getCollisionBlocks(AxisAlignedBB $bb, bool $targetFirst = false) : array{
$minX = Math::floorFloat($bb->minX); $bbPlusOne = $bb->grow(1, 1, 1);
$minY = Math::floorFloat($bb->minY); $minX = Math::floorFloat($bbPlusOne->minX);
$minZ = Math::floorFloat($bb->minZ); $minY = Math::floorFloat($bbPlusOne->minY);
$maxX = Math::ceilFloat($bb->maxX); $minZ = Math::floorFloat($bbPlusOne->minZ);
$maxY = Math::ceilFloat($bb->maxY); $maxX = Math::ceilFloat($bbPlusOne->maxX);
$maxZ = Math::ceilFloat($bb->maxZ); $maxY = Math::ceilFloat($bbPlusOne->maxY);
$maxZ = Math::ceilFloat($bbPlusOne->maxZ);
$collides = []; $collides = [];
@ -1157,12 +1158,13 @@ class Level implements ChunkManager, Metadatable{
* @return AxisAlignedBB[] * @return AxisAlignedBB[]
*/ */
public function getCollisionCubes(Entity $entity, AxisAlignedBB $bb, bool $entities = true) : array{ public function getCollisionCubes(Entity $entity, AxisAlignedBB $bb, bool $entities = true) : array{
$minX = Math::floorFloat($bb->minX); $bbPlusOne = $bb->grow(1, 1, 1);
$minY = Math::floorFloat($bb->minY); $minX = Math::floorFloat($bbPlusOne->minX);
$minZ = Math::floorFloat($bb->minZ); $minY = Math::floorFloat($bbPlusOne->minY);
$maxX = Math::ceilFloat($bb->maxX); $minZ = Math::floorFloat($bbPlusOne->minZ);
$maxY = Math::ceilFloat($bb->maxY); $maxX = Math::ceilFloat($bbPlusOne->maxX);
$maxZ = Math::ceilFloat($bb->maxZ); $maxY = Math::ceilFloat($bbPlusOne->maxY);
$maxZ = Math::ceilFloat($bbPlusOne->maxZ);
$collides = []; $collides = [];