1
0

Merge branch 'master' into PerWorldThreads.

Also fixed the AllToLua script not resolving conflicts.
This commit is contained in:
madmaxoft
2013-08-13 23:02:22 +02:00
24 changed files with 437 additions and 178 deletions

View File

@@ -791,8 +791,8 @@ void cPlayer::SendMessage(const AString & a_Message)
void cPlayer::TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ)
{
m_LastGroundHeight = (float)a_PosY;
SetPosition( a_PosX, a_PosY, a_PosZ );
m_LastGroundHeight = (float)a_PosY;
m_World->BroadcastTeleportEntity(*this, GetClientHandle());
m_ClientHandle->SendPlayerMoveLook();