summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol125.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-29 23:44:01 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-29 23:44:16 +0200
commitb9d4431f6f2b60802d66da03f0b915bbd2c846cb (patch)
tree7cae9033a5a29f9a3483230edbcb31b6b7127b84 /src/Protocol/Protocol125.cpp
parentFixed offline UUID generator. (diff)
downloadcuberite-b9d4431f6f2b60802d66da03f0b915bbd2c846cb.tar
cuberite-b9d4431f6f2b60802d66da03f0b915bbd2c846cb.tar.gz
cuberite-b9d4431f6f2b60802d66da03f0b915bbd2c846cb.tar.bz2
cuberite-b9d4431f6f2b60802d66da03f0b915bbd2c846cb.tar.lz
cuberite-b9d4431f6f2b60802d66da03f0b915bbd2c846cb.tar.xz
cuberite-b9d4431f6f2b60802d66da03f0b915bbd2c846cb.tar.zst
cuberite-b9d4431f6f2b60802d66da03f0b915bbd2c846cb.zip
Diffstat (limited to 'src/Protocol/Protocol125.cpp')
-rw-r--r--src/Protocol/Protocol125.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Protocol/Protocol125.cpp b/src/Protocol/Protocol125.cpp
index d53427bf7..6dc2e918d 100644
--- a/src/Protocol/Protocol125.cpp
+++ b/src/Protocol/Protocol125.cpp
@@ -833,12 +833,12 @@ void cProtocol125::SendRemoveEntityEffect(const cEntity & a_Entity, int a_Effect
-void cProtocol125::SendRespawn(const cWorld & a_World)
+void cProtocol125::SendRespawn(const cWorld & a_World, bool a_ShouldIgnoreDimensionChecks)
{
cCSLock Lock(m_CSPacket);
- if (m_LastSentDimension == a_World.GetDimension())
+ if ((m_LastSentDimension == a_World.GetDimension()) && !a_ShouldIgnoreDimensionChecks)
{
- // Must not send a respawn for the world with the same dimension, the client goes cuckoo if we do
+ // Must not send a respawn for the world with the same dimension, the client goes cuckoo if we do (unless we are respawning from death)
return;
}
cPlayer * Player = m_Client->GetPlayer();