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

Made entity collision checks for block placement more logical and less wasteful

Browse Source 
We don't care how many entities collide, only that a non-zero number collided.
This commit is contained in:
Dylan K. Taylor 2017-09-03 11:50:15 +01:00
parent 0b83c61494
commit 41780fd195
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1743,26 +1743,22 @@ class Level implements ChunkManager, Metadatable{
if($hand->isSolid() === true and $hand->getBoundingBox() !== null){ if($hand->isSolid() === true and $hand->getBoundingBox() !== null){
$entities = $this->getCollidingEntities($hand->getBoundingBox()); $entities = $this->getCollidingEntities($hand->getBoundingBox());
$realCount = 0;
foreach($entities as $e){ foreach($entities as $e){
if($e instanceof Arrow or $e instanceof DroppedItem){ if($e instanceof Arrow or $e instanceof DroppedItem){
continue; continue;
} }
++$realCount;
return false; //Entity in block
} }
if($player !== null){ if($player !== null){
if(($diff = $player->getNextPosition()->subtract($player->getPosition())) and $diff->lengthSquared() > 0.00001){ if(($diff = $player->getNextPosition()->subtract($player->getPosition())) and $diff->lengthSquared() > 0.00001){
$bb = $player->getBoundingBox()->getOffsetBoundingBox($diff->x, $diff->y, $diff->z); $bb = $player->getBoundingBox()->getOffsetBoundingBox($diff->x, $diff->y, $diff->z);
if($hand->getBoundingBox()->intersectsWith($bb)){ if($hand->getBoundingBox()->intersectsWith($bb)){
++$realCount; return false; //Inside player BB
} }
} }
} }
if($realCount > 0){
return false; //Entity in block
}
} }