Merge pull request #2349 from cuberite/maps

Improved maps

src/Entities/Player.cpp

@@ -206,6 +206,7 @@ void cPlayer::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 		if (m_ClientHandle->IsDestroyed())
 		{
 			// This should not happen, because destroying a client will remove it from the world, but just in case
+			ASSERT(!"Player ticked whilst in the process of destruction!");
 			m_ClientHandle = nullptr;
 			return;
 		}
@@ -216,6 +217,10 @@ void cPlayer::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 			return;
 		}
 	}
+	else
+	{
+		ASSERT(!"Player ticked whilst in the process of destruction!");
+	}
 
 	m_Stats.AddValue(statMinutesPlayed, 1);