From 1dc37565334e1745e80e5dfe5718d645188ce0e2 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 12 Feb 2016 02:23:13 +0100 Subject: [PATCH] Fixed respawn crash when a player died that had never spawned --- src/Game/Systems/PlayerSpawnSystem.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Game/Systems/PlayerSpawnSystem.cpp b/src/Game/Systems/PlayerSpawnSystem.cpp index ac0ecdf3..e43cee13 100644 --- a/src/Game/Systems/PlayerSpawnSystem.cpp +++ b/src/Game/Systems/PlayerSpawnSystem.cpp @@ -175,8 +175,15 @@ bool PlayerSpawnSystem::OnPlayerDeath(Events::PlayerDeath& e) if ((ComponentInfo::EnumType)cTeam["Team"] == cTeam["Team"].Enum("Spectator")) { return false; } + + if (m_PlayerIDs.count(e.Player.ID) == 0) { + return false; + } + SpawnRequest req; req.PlayerID = m_PlayerIDs.at(e.Player.ID); req.Team = cTeam["Team"]; m_SpawnRequests.push_back(req); + + return true; }