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

Merge commit '9232f4509c4b74718bce2d8f33ba71ca74b38d97'

Browse Source 
# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-01-04 16:21:31 +00:00
commit 0050e12515
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/timings/TimingsHandler.php
View File

@ -179,7 +179,10 @@ class TimingsHandler{
private function internalStopTiming(float $now) : void{ private function internalStopTiming(float $now) : void{
if($this->timingDepth === 0){ if($this->timingDepth === 0){
throw new \InvalidStateException("Cannot stop a timer that is not running"); //TODO: it would be nice to bail here, but since we'd have to track timing depth across resets
//and enable/disable, it would have a performance impact. Therefore, considering the limited
//usefulness of bailing here anyway, we don't currently bother.
return;
} }
if(--$this->timingDepth !== 0 or $this->start == 0){ if(--$this->timingDepth !== 0 or $this->start == 0){
return; return;