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

Entity: avoid double-checking block intersections for moving entities

Browse Source 
fixes #1824
This commit is contained in:
Dylan K. Taylor 2023-04-16 17:38:26 +01:00
parent b5dc72b0ee
commit 56fbd45dd5
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/entity/Entity.php
View File

@ -115,6 +115,8 @@ abstract class Entity{
/** @var Block[]|null */ /** @var Block[]|null */
protected $blocksAround; protected $blocksAround;
private bool $checkBlockIntersectionsNextTick = true;
/** @var Location */ /** @var Location */
protected $location; protected $location;
/** @var Location */ /** @var Location */
@ -649,7 +651,10 @@ abstract class Entity{
$hasUpdate = false; $hasUpdate = false;
$this->checkBlockIntersections(); if($this->checkBlockIntersectionsNextTick){
$this->checkBlockIntersections();
}
$this->checkBlockIntersectionsNextTick = true;
if($this->location->y <= World::Y_MIN - 16 && $this->isAlive()){ if($this->location->y <= World::Y_MIN - 16 && $this->isAlive()){
$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_VOID, 10); $ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_VOID, 10);
@ -1308,6 +1313,7 @@ abstract class Entity{
} }
protected function checkBlockIntersections() : void{ protected function checkBlockIntersections() : void{
$this->checkBlockIntersectionsNextTick = false;
$vectors = []; $vectors = [];
foreach($this->getBlocksAroundWithEntityInsideActions() as $block){ foreach($this->getBlocksAroundWithEntityInsideActions() as $block){