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

Added basic support for blocks with multiple AABBs, fixed stairs (#1303)

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-10-12 16:29:24 +01:00
committed by GitHub
parent 0c092a7ceb
commit 15d6fd86e2
5 changed files with 127 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1188,7 +1188,9 @@ class Level implements ChunkManager, Metadatable{
for($y = $minY; $y <= $maxY; ++$y){
$block = $this->getBlock($this->temporalVector->setComponents($x, $y, $z));
if(!$block->canPassThrough() and $block->collidesWithBB($bb)){
$collides[] = $block->getBoundingBox();
foreach($block->getCollisionBoxes() as $blockBB){
$collides[] = $blockBB;
}
}
}
}
@ -1789,21 +1791,23 @@ class Level implements ChunkManager, Metadatable{
return false;
}
if($hand->isSolid() === true and $hand->getBoundingBox() !== null){
$entities = $this->getCollidingEntities($hand->getBoundingBox());
foreach($entities as $e){
if($e instanceof Arrow or $e instanceof DroppedItem or ($e instanceof Player and $e->isSpectator())){
continue;
if($hand->isSolid()){
foreach($hand->getCollisionBoxes() as $collisionBox){
$entities = $this->getCollidingEntities($collisionBox);
foreach($entities as $e){
if($e instanceof Arrow or $e instanceof DroppedItem or ($e instanceof Player and $e->isSpectator())){
continue;
}
return false; //Entity in block
}
return false; //Entity in block
}
if($player !== null){
if(($diff = $player->getNextPosition()->subtract($player->getPosition())) and $diff->lengthSquared() > 0.00001){
$bb = $player->getBoundingBox()->getOffsetBoundingBox($diff->x, $diff->y, $diff->z);
if($hand->getBoundingBox()->intersectsWith($bb)){
return false; //Inside player BB
if($player !== null){
if(($diff = $player->getNextPosition()->subtract($player->getPosition())) and $diff->lengthSquared() > 0.00001){
$bb = $player->getBoundingBox()->getOffsetBoundingBox($diff->x, $diff->y, $diff->z);
if($collisionBox->intersectsWith($bb)){
return false; //Inside player BB
}
}
}
}