php5 is dead, reverted some teleport tweaks, nullsafe is deprecated, cactus hitbox is fixed

This commit is contained in:
GameHerobrine 2023-08-21 01:34:44 +03:00
parent 2e374fb09c
commit 0c8b56e22b
11 changed files with 35 additions and 58 deletions

View file

@ -182,13 +182,7 @@ class AxisAlignedBB{
}
public function intersectsWith(AxisAlignedBB $bb){
if($bb->maxX > $this->minX and $bb->minX < $this->maxX){
if($bb->maxY > $this->minY and $bb->minY < $this->maxY){
return $bb->maxZ > $this->minZ and $bb->minZ < $this->maxZ;
}
}
return false;
return $bb->maxX > $this->minX and $bb->minX < $this->maxX && $bb->maxZ > $this->minZ and $bb->minZ < $this->maxZ && $bb->maxY > $this->minY and $bb->minY < $this->maxY;
}
public function isXYZInside($x, $y, $z){