From 0e95c5bb958a505f4971f997402fd5f81c785040 Mon Sep 17 00:00:00 2001
From: Tleety <dahltobbe@hotmail.com>
Date: Fri, 4 Mar 2016 02:52:04 +0100
Subject: [PATCH] Fixes

---
 include/Engine/Core/System.h             | 2 +-
 include/Game/Systems/ScoreScreenSystem.h | 2 +-
 src/Game/Systems/ScoreScreenSystem.cpp   | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/Engine/Core/System.h b/include/Engine/Core/System.h
index 23d5f9a5..1ca1c824 100644
--- a/include/Engine/Core/System.h
+++ b/include/Engine/Core/System.h
@@ -68,7 +68,7 @@ protected:
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System
diff --git a/include/Game/Systems/ScoreScreenSystem.h b/include/Game/Systems/ScoreScreenSystem.h
index f2528a7f..2559bfb3 100644
--- a/include/Game/Systems/ScoreScreenSystem.h
+++ b/include/Game/Systems/ScoreScreenSystem.h
@@ -15,7 +15,7 @@ class ScoreScreenSystem : public PureSystem
 public:
     ScoreScreenSystem(SystemParams params);
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) override;
 
     EventRelay<ScoreScreenSystem, Events::KillDeath> m_EPlayerDeath;
     bool OnPlayerDeath(const Events::KillDeath& e);
diff --git a/src/Game/Systems/ScoreScreenSystem.cpp b/src/Game/Systems/ScoreScreenSystem.cpp
index 338e7acc..2ad45f53 100644
--- a/src/Game/Systems/ScoreScreenSystem.cpp
+++ b/src/Game/Systems/ScoreScreenSystem.cpp
@@ -11,7 +11,7 @@ ScoreScreenSystem::ScoreScreenSystem(SystemParams params)
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDisconnected, &ScoreScreenSystem::OnPlayerDisconnected);
 }
 
-void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt)
+void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt)
 {
     if (!IsServer) {
         return;
@@ -28,6 +28,8 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
 
     if(entity.HasComponent("Team")) {
         currentTeam = (int)entity["Team"]["Team"];
+    } else {
+        return;
     }
 
     auto children = entity.ChildrenWithComponent("ScoreIdentity");
@@ -56,6 +58,9 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
                     }
                 }
                 found = true;
+                if(!child.Valid()) {
+                    break;
+                }
                 //Update Deaths for child
                 (int&)child["ScoreIdentity"]["Kills"] = it->second.Kills;
                 //Update Kills for child