BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WIP trying to hot fix

Browse Source
This commit is contained in:
stiffly
2016-02-11 22:15:47 +01:00
parent 055f6517a1
commit b66e3d3630
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Network/Client.cpp
+11 -4
View File
@@ -178,15 +178,22 @@ void Client::parseKick()
void Client::parseSpawnEvents() void Client::parseSpawnEvents()
{ {
std::vector<Events::PlayerSpawned> tempSpawn;
for (int i = 0; i < m_PlayerSpawnEvents.size(); i++) { for (int i = 0; i < m_PlayerSpawnEvents.size(); i++) {
Events::PlayerSpawned e; Events::PlayerSpawned e;
e.Player = EntityWrapper(m_World, m_ServerIDToClientID[m_PlayerSpawnEvents[i].Player.ID]); if (!serverClientMapsHasEntity(m_PlayerSpawnEvents.at(i).Player.ID) ||
e.Spawner = EntityWrapper(m_World, m_ServerIDToClientID[m_PlayerSpawnEvents[i].Spawner.ID]); !serverClientMapsHasEntity(m_PlayerSpawnEvents.at(i).Spawner.ID)) {
tempSpawn.push_back(m_PlayerSpawnEvents.at(i));
continue;
}
e.Player = EntityWrapper(m_World, m_ServerIDToClientID.at(m_PlayerSpawnEvents.at(i).Player.ID));
e.Spawner = EntityWrapper(m_World, m_ServerIDToClientID.at(m_PlayerSpawnEvents.at(i).Spawner.ID));
e.PlayerID = -1; e.PlayerID = -1;
e.PlayerName = m_PlayerSpawnEvents[i].PlayerName; e.PlayerName = m_PlayerSpawnEvents.at(i).PlayerName;
m_EventBroker->Publish(e); m_EventBroker->Publish(e);
} }
m_PlayerSpawnEvents.clear(); m_PlayerSpawnEvents = tempSpawn;
// m_PlayerSpawnEvents.clear();
} }
void Client::parsePlayersSpawned(Packet& packet) void Client::parsePlayersSpawned(Packet& packet)