1
0

Fix failed merge and other issues

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

View File

@@ -2375,9 +2375,9 @@ void cClientHandle::SendRemoveEntityEffect(const cEntity & a_Entity, int a_Effec
void cClientHandle::SendRespawn(eDimension a_Dimension)
void cClientHandle::SendRespawn(eDimension a_Dimension, bool a_ShouldIgnoreDimensionChecks)
{
m_Protocol->SendRespawn(a_Dimension);
m_Protocol->SendRespawn(a_Dimension, a_ShouldIgnoreDimensionChecks);
}