From c088f7ff0a336703fb19038eef36f736a4e388f7 Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Sat, 27 Aug 2016 09:37:54 +0300 Subject: Proper respawn packets on dimension travel --- src/ClientHandle.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/ClientHandle.h') diff --git a/src/ClientHandle.h b/src/ClientHandle.h index c49de647f..da59bdea8 100644 --- a/src/ClientHandle.h +++ b/src/ClientHandle.h @@ -369,6 +369,9 @@ public: // tolua_export bool IsPlayerChunkSent(); private: + /** The dimension that was last sent to a player in a Respawn or Login packet. + Used to avoid Respawning into the same dimension, which confuses the client. */ + eDimension m_LastSentDimension; friend class cServer; // Needs access to SetSelf() -- cgit v1.2.3 From 5625598afac8db3b35d790b8d1228997b228f228 Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Sat, 3 Sep 2016 10:39:52 +0300 Subject: Improve cPlayer::DoMoveToWorld (#3113) --- src/ClientHandle.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/ClientHandle.h') diff --git a/src/ClientHandle.h b/src/ClientHandle.h index da59bdea8..7d829653b 100644 --- a/src/ClientHandle.h +++ b/src/ClientHandle.h @@ -125,7 +125,8 @@ public: // tolua_export /** Remove all loaded chunks that are no longer in range */ void UnloadOutOfRangeChunks(void); - // Removes the client from all chunks. Used when switching worlds or destroying the player + /** Removes the client from all chunks. Used when destroying the player. + When switching worlds, RemoveFromWorld does this function's job so it isn't called. */ void RemoveFromAllChunks(void); inline bool IsLoggedIn(void) const { return (m_State >= csAuthenticating); } -- cgit v1.2.3