flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix failed merge and other issues

Browse Source
This commit is contained in:
Tiger Wang
2014-07-18 20:12:27 +01:00
parent 37140ae578
commit 719551c31f
14 changed files with 28 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Protocol/Protocol125.cpp
View File

@@ -836,7 +836,7 @@ void cProtocol125::SendRemoveEntityEffect(const cEntity & a_Entity, int a_Effect
void cProtocol125::SendRespawn(eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks)
{
cCSLock Lock(m_CSPacket);
if ((m_LastSentDimension == a_World.GetDimension()) && !a_ShouldIgnoreDimensionChecks)
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;