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

World: Remove incorrect isSolid() check for placement collision check

Browse Source 
isSolid() != can be collided with. That's decided by the collision boxes provided, if any.
This commit is contained in:
Dylan K. Taylor 2019-05-12 16:00:38 +01:00
parent 90e6073202
commit db4dac6d45
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pocketmine/world/World.php
View File

@ -1813,18 +1813,16 @@ class World implements ChunkManager, Metadatable{
return false; return false;
} }
if($hand->isSolid()){ foreach($hand->getCollisionBoxes() as $collisionBox){
foreach($hand->getCollisionBoxes() as $collisionBox){ if(!empty($this->getCollidingEntities($collisionBox))){
if(!empty($this->getCollidingEntities($collisionBox))){ return false; //Entity in block
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()->offsetCopy($diff->x, $diff->y, $diff->z); $bb = $player->getBoundingBox()->offsetCopy($diff->x, $diff->y, $diff->z);
if($collisionBox->intersectsWith($bb)){ if($collisionBox->intersectsWith($bb)){
return false; //Inside player BB return false; //Inside player BB
}
} }
} }
} }