Merge branch '3.5' into master-rollback

This commit is contained in:
Dylan K. Taylor
2019-02-04 19:47:21 +00:00
4 changed files with 18 additions and 10 deletions

View File

@ -89,7 +89,7 @@ class SplashPotion extends Throwable{
if(!$this->willLinger()){
foreach($this->level->getNearbyEntities($this->boundingBox->expandedCopy(4.125, 2.125, 4.125), $this) as $entity){
if($entity instanceof Living and $entity->isAlive()){
$distanceSquared = $entity->distanceSquared($this);
$distanceSquared = $entity->add(0, $entity->getEyeHeight(), 0)->distanceSquared($this);
if($distanceSquared > 16){ //4 blocks
continue;
}