summaryrefslogtreecommitdiffstats
path: root/source/Entities
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-20 21:17:33 +0200
committermadmaxoft <github@xoft.cz>2013-08-20 21:17:33 +0200
commite8f7b72f1b20b6b3861ab8c7f247501618bb1df7 (patch)
tree12ea5233fe93cb79f93e3e6f251bbd3272d4b7f8 /source/Entities
parentFixed player spawning. (diff)
downloadcuberite-e8f7b72f1b20b6b3861ab8c7f247501618bb1df7.tar
cuberite-e8f7b72f1b20b6b3861ab8c7f247501618bb1df7.tar.gz
cuberite-e8f7b72f1b20b6b3861ab8c7f247501618bb1df7.tar.bz2
cuberite-e8f7b72f1b20b6b3861ab8c7f247501618bb1df7.tar.lz
cuberite-e8f7b72f1b20b6b3861ab8c7f247501618bb1df7.tar.xz
cuberite-e8f7b72f1b20b6b3861ab8c7f247501618bb1df7.tar.zst
cuberite-e8f7b72f1b20b6b3861ab8c7f247501618bb1df7.zip
Diffstat (limited to 'source/Entities')
-rw-r--r--source/Entities/Player.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp
index 3ccb4ca1d..119afbafc 100644
--- a/source/Entities/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -200,6 +200,12 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
}
}
+ if (!a_Chunk.IsValid())
+ {
+ // This may happen if the cPlayer is created before the chunks have the chance of being loaded / generated (#83)
+ return;
+ }
+
super::Tick(a_Dt, a_Chunk);
// Set player swimming state