summaryrefslogtreecommitdiffstats
path: root/source/cPlayer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/cPlayer.cpp')
-rw-r--r--source/cPlayer.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp
index f013465de..673d0b41a 100644
--- a/source/cPlayer.cpp
+++ b/source/cPlayer.cpp
@@ -177,6 +177,12 @@ cPacket * cPlayer::GetSpawnPacket(void) const
void cPlayer::Tick(float a_Dt)
{
+ if (!m_ClientHandle->IsPlaying())
+ {
+ // We're not yet in the game, ignore everything
+ return;
+ }
+
cPawn::Tick(a_Dt);
if (m_bDirtyOrientation && !m_bDirtyPosition)
@@ -233,7 +239,7 @@ void cPlayer::Tick(float a_Dt)
m_ClientHandle->StreamChunks();
}
- if ( m_Health > 0 ) // make sure player is alive
+ if (m_Health > 0) // make sure player is alive
{
m_World->CollectPickupsByPlayer(this);
}