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

Remove premature optimisation from World::getCollidingEntities()

Browse Source 
this is already covered in more fine-grained detail by canCollideWith().

[bc break]
This commit is contained in:
Dylan K. Taylor 2022-06-01 21:00:54 +01:00
parent b7e2b3e94a
commit 6ee551c5e1
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entity/Entity.php
View File

@ -140,8 +140,6 @@ abstract class Entity{
public $lastUpdate; public $lastUpdate;
/** @var int */ /** @var int */
protected $fireTicks = 0; protected $fireTicks = 0;
/** @var bool */
public $canCollide = true;
/** @var bool */ /** @var bool */
protected $isStatic = false; protected $isStatic = false;

2
src/entity/object/FallingBlock.php
View File

@ -49,8 +49,6 @@ class FallingBlock extends Entity{
/** @var Block */ /** @var Block */
protected $block; protected $block;
public $canCollide = false;
public function __construct(Location $location, Block $block, ?CompoundTag $nbt = null){ public function __construct(Location $location, Block $block, ?CompoundTag $nbt = null){
$this->block = $block; $this->block = $block;
parent::__construct($location, $nbt); parent::__construct($location, $nbt);

2
src/entity/object/ItemEntity.php
View File

@ -59,8 +59,6 @@ class ItemEntity extends Entity{
/** @var Item */ /** @var Item */
protected $item; protected $item;
public $canCollide = false;
/** @var int */ /** @var int */
protected $despawnDelay = self::DEFAULT_DESPAWN_DELAY; protected $despawnDelay = self::DEFAULT_DESPAWN_DELAY;

2
src/entity/object/PrimedTNT.php
View File

@ -46,8 +46,6 @@ class PrimedTNT extends Entity implements Explosive{
protected bool $worksUnderwater = false; protected bool $worksUnderwater = false;
public $canCollide = false;
protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.98, 0.98); } protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.98, 0.98); }
protected function getInitialDragMultiplier() : float{ return 0.02; } protected function getInitialDragMultiplier() : float{ return 0.02; }

8
src/world/World.php
View File

@ -1904,11 +1904,9 @@ class World implements ChunkManager{
public function getCollidingEntities(AxisAlignedBB $bb, ?Entity $entity = null) : array{ public function getCollidingEntities(AxisAlignedBB $bb, ?Entity $entity = null) : array{
$nearby = []; $nearby = [];
if($entity === null || $entity->canCollide){ foreach($this->getNearbyEntities($bb, $entity) as $ent){
foreach($this->getNearbyEntities($bb, $entity) as $ent){ if($ent->canBeCollidedWith() && ($entity === null || $entity->canCollideWith($ent))){
if($ent->canBeCollidedWith() && ($entity === null || $entity->canCollideWith($ent))){ $nearby[] = $ent;
$nearby[] = $ent;
}
} }
} }