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

Merge pull request #1846 from mc-server/WorldChanging

Browse Source 
Fixed player switching world bug
This commit is contained in:
Mattes D 2015-04-04 11:32:17 +02:00
commit e42e46d5f9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Player.cpp
View File

@ -1603,6 +1603,9 @@ bool cPlayer::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn)
m_ClientHandle->SendRespawn(a_World->GetDimension()); m_ClientHandle->SendRespawn(a_World->GetDimension());
} }
// Broadcast for other people that the player is gone.
GetWorld()->BroadcastDestroyEntity(*this);
// Remove player from the old world // Remove player from the old world
SetWorldTravellingFrom(GetWorld()); // cChunk handles entity removal SetWorldTravellingFrom(GetWorld()); // cChunk handles entity removal
GetWorld()->RemovePlayer(this, false); GetWorld()->RemovePlayer(this, false);
@ -1620,6 +1623,9 @@ bool cPlayer::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn)
m_ClientHandle->SendWeather(a_World->GetWeather()); m_ClientHandle->SendWeather(a_World->GetWeather());
} }
// Broadcast the player into the new world.
a_World->BroadcastSpawnEntity(*this);
return true; return true;
} }