From c8eefddfc0d47f7bb9e02be2ea5ce5f09d0ee5a7 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 14 Jun 2019 17:59:00 +0100
Subject: [PATCH] Chunk: fix tiles not being loaded from NBT in some cases

---
 src/pocketmine/world/format/Chunk.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pocketmine/world/format/Chunk.php b/src/pocketmine/world/format/Chunk.php
index 89c0c1eaf..3adc91b74 100644
--- a/src/pocketmine/world/format/Chunk.php
+++ b/src/pocketmine/world/format/Chunk.php
@@ -598,8 +598,11 @@ class Chunk{
 						}
 					}
 				}
-				$world->timings->syncChunkLoadEntitiesTimer->stopTiming();
 
+				$this->NBTentities = null;
+				$world->timings->syncChunkLoadEntitiesTimer->stopTiming();
+			}
+			if($this->NBTtiles !== null){
 				$world->timings->syncChunkLoadTileEntitiesTimer->startTiming();
 				foreach($this->NBTtiles as $nbt){
 					if($nbt instanceof CompoundTag){
@@ -613,10 +616,8 @@ class Chunk{
 					}
 				}
 
-				$world->timings->syncChunkLoadTileEntitiesTimer->stopTiming();
-
-				$this->NBTentities = null;
 				$this->NBTtiles = null;
+				$world->timings->syncChunkLoadTileEntitiesTimer->stopTiming();
 			}
 
 			$this->hasChanged = $changed;