summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol18x.cpp
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-08-27 08:37:54 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-08-29 10:16:06 +0200
commitc088f7ff0a336703fb19038eef36f736a4e388f7 (patch)
treef1d9104b186d02f5da8f31ed8ce124bfbff3f6b2 /src/Protocol/Protocol18x.cpp
parentFixed SendUnloadChunk bug (#3353) (diff)
downloadcuberite-c088f7ff0a336703fb19038eef36f736a4e388f7.tar
cuberite-c088f7ff0a336703fb19038eef36f736a4e388f7.tar.gz
cuberite-c088f7ff0a336703fb19038eef36f736a4e388f7.tar.bz2
cuberite-c088f7ff0a336703fb19038eef36f736a4e388f7.tar.lz
cuberite-c088f7ff0a336703fb19038eef36f736a4e388f7.tar.xz
cuberite-c088f7ff0a336703fb19038eef36f736a4e388f7.tar.zst
cuberite-c088f7ff0a336703fb19038eef36f736a4e388f7.zip
Diffstat (limited to 'src/Protocol/Protocol18x.cpp')
-rw-r--r--src/Protocol/Protocol18x.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Protocol/Protocol18x.cpp b/src/Protocol/Protocol18x.cpp
index 88a0757f2..c1018324f 100644
--- a/src/Protocol/Protocol18x.cpp
+++ b/src/Protocol/Protocol18x.cpp
@@ -107,8 +107,7 @@ cProtocol180::cProtocol180(cClientHandle * a_Client, const AString & a_ServerAdd
m_ServerPort(a_ServerPort),
m_State(a_State),
m_ReceivedData(32 KiB),
- m_IsEncrypted(false),
- m_LastSentDimension(dimNotSet)
+ m_IsEncrypted(false)
{
// BungeeCord handling:
@@ -626,7 +625,6 @@ void cProtocol180::SendLogin(const cPlayer & a_Player, const cWorld & a_World)
Pkt.WriteString("default"); // Level type - wtf?
Pkt.WriteBool(false); // Reduced Debug Info - wtf?
}
- m_LastSentDimension = a_World.GetDimension();
// Send the spawn position:
{
@@ -1084,13 +1082,8 @@ void cProtocol180::SendResetTitle(void)
-void cProtocol180::SendRespawn(eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks)
+void cProtocol180::SendRespawn(eDimension a_Dimension)
{
- if ((m_LastSentDimension == a_Dimension) && !a_ShouldIgnoreDimensionChecks)
- {
- // 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;
- }
cPacketizer Pkt(*this, 0x07); // Respawn packet
cPlayer * Player = m_Client->GetPlayer();
@@ -1098,7 +1091,6 @@ void cProtocol180::SendRespawn(eDimension a_Dimension, bool a_ShouldIgnoreDimens
Pkt.WriteBEUInt8(2); // TODO: Difficulty (set to Normal)
Pkt.WriteBEUInt8(static_cast<Byte>(Player->GetEffectiveGameMode()));
Pkt.WriteString("default");
- m_LastSentDimension = a_Dimension;
}