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

Fixed entityBaseTickTimer doesn't cover child overrides

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-07 14:20:57 +01:00
parent 44f1dedbf8
commit 54b6a5710e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/entity/Entity.php
View File

@ -1121,8 +1121,6 @@ abstract class Entity extends Location implements Metadatable{
} }
public function entityBaseTick($tickDiff = 1){ public function entityBaseTick($tickDiff = 1){
Timings::$timerEntityBaseTick->startTiming();
//TODO: check vehicles //TODO: check vehicles
$this->blocksAround = null; $this->blocksAround = null;
@ -1135,7 +1133,6 @@ abstract class Entity extends Location implements Metadatable{
$this->close(); $this->close();
} }
Timings::$timerEntityBaseTick->stopTiming();
return false; return false;
} }
@ -1199,8 +1196,6 @@ abstract class Entity extends Location implements Metadatable{
$this->age += $tickDiff; $this->age += $tickDiff;
$this->ticksLived += $tickDiff; $this->ticksLived += $tickDiff;
Timings::$timerEntityBaseTick->stopTiming();
return $hasUpdate; return $hasUpdate;
} }
@ -1272,7 +1267,9 @@ abstract class Entity extends Location implements Metadatable{
$this->timings->startTiming(); $this->timings->startTiming();
Timings::$timerEntityBaseTick->startTiming();
$hasUpdate = $this->entityBaseTick($tickDiff); $hasUpdate = $this->entityBaseTick($tickDiff);
Timings::$timerEntityBaseTick->stopTiming();
$this->updateMovement(); $this->updateMovement();