From 37e12ebf88afd5b893e208afb925873c713d7384 Mon Sep 17 00:00:00 2001
From: kremsy <lukas@esc-clan.net>
Date: Tue, 9 May 2017 19:11:19 +0200
Subject: [PATCH] small callback stability improvement

---
 .../ShootMania/OnScoresStructure.php          | 19 ++++++-----
 .../TrackMania/OnScoresStructure.php          | 34 ++++++++++---------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/core/Callbacks/Structures/ShootMania/OnScoresStructure.php b/core/Callbacks/Structures/ShootMania/OnScoresStructure.php
index f7a27492..7f441bb4 100644
--- a/core/Callbacks/Structures/ShootMania/OnScoresStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnScoresStructure.php
@@ -30,15 +30,18 @@ class OnScoresStructure extends CommonScoresStructure {
 		$jsonObj = $this->getPlainJsonObject();
 
 		foreach ($jsonObj->players as $jsonPlayer) {
-			$playerScore = new PlayerScore();
-			$playerScore->setPlayer($this->maniaControl->getPlayerManager()->getPlayer($jsonPlayer->login));
-			$playerScore->setRank($jsonPlayer->rank);
-			$playerScore->setRoundPoints($jsonPlayer->roundpoints);
-			$playerScore->setMapPoints($jsonPlayer->mappoints);
-			$playerScore->setMatchPoints($jsonPlayer->matchpoints);
+			$player = $this->maniaControl->getPlayerManager()->getPlayer($jsonPlayer->login);
+			if($player){
+				$playerScore = new PlayerScore();
+				$playerScore->setPlayer($this->maniaControl->getPlayerManager()->getPlayer($jsonPlayer->login));
 
-			$this->playerScores[$jsonPlayer->login] = $playerScore;
+				$playerScore->setRank($jsonPlayer->rank);
+				$playerScore->setRoundPoints($jsonPlayer->roundpoints);
+				$playerScore->setMapPoints($jsonPlayer->mappoints);
+				$playerScore->setMatchPoints($jsonPlayer->matchpoints);
+
+				$this->playerScores[$jsonPlayer->login] = $playerScore;
+			}
 		}
-
 	}
 }
\ No newline at end of file
diff --git a/core/Callbacks/Structures/TrackMania/OnScoresStructure.php b/core/Callbacks/Structures/TrackMania/OnScoresStructure.php
index c559348f..1b90ef49 100644
--- a/core/Callbacks/Structures/TrackMania/OnScoresStructure.php
+++ b/core/Callbacks/Structures/TrackMania/OnScoresStructure.php
@@ -4,7 +4,6 @@ namespace ManiaControl\Callbacks\Structures\TrackMania;
 
 use ManiaControl\Callbacks\Structures\Common\CommonScoresStructure;
 use ManiaControl\Callbacks\Structures\TrackMania\Models\PlayerScore;
-use ManiaControl\Callbacks\Structures\TrackMania\Models\TeamScore;
 use ManiaControl\ManiaControl;
 
 /**
@@ -27,22 +26,25 @@ class OnScoresStructure extends CommonScoresStructure {
 		parent::__construct($maniaControl, $data);
 
 		$jsonObj = $this->getPlainJsonObject();
-		
-		foreach ($jsonObj->players as $jsonPlayer) {
-			$playerScore = new PlayerScore();
-			$playerScore->setPlayer($this->maniaControl->getPlayerManager()->getPlayer($jsonPlayer->login));
-			$playerScore->setRank($jsonPlayer->rank);
-			$playerScore->setRoundPoints($jsonPlayer->roundpoints);
-			$playerScore->setMapPoints($jsonPlayer->mappoints);
-			$playerScore->setBestRaceTime($jsonPlayer->bestracetime);
-			$playerScore->setBestLapTime($jsonPlayer->bestlaptime);
-			$playerScore->setStuntScore($jsonPlayer->stuntsscore);
-			$playerScore->setBestRaceRespawns($jsonPlayer->bestracerespawns);
-			$playerScore->setBestRaceCheckpoints($jsonPlayer->bestracecheckpoints);
-			$playerScore->setBestLapRespawns($jsonPlayer->bestlaprespawns);
-			$playerScore->setBestLapCheckpoints($jsonPlayer->bestlapcheckpoints);
 
-			$this->playerScores[$jsonPlayer->login] = $playerScore;
+		foreach ($jsonObj->players as $jsonPlayer) {
+			$player = $this->maniaControl->getPlayerManager()->getPlayer($jsonPlayer->login);
+			if ($player) {
+				$playerScore = new PlayerScore();
+				$playerScore->setPlayer($this->maniaControl->getPlayerManager()->getPlayer($jsonPlayer->login));
+				$playerScore->setRank($jsonPlayer->rank);
+				$playerScore->setRoundPoints($jsonPlayer->roundpoints);
+				$playerScore->setMapPoints($jsonPlayer->mappoints);
+				$playerScore->setBestRaceTime($jsonPlayer->bestracetime);
+				$playerScore->setBestLapTime($jsonPlayer->bestlaptime);
+				$playerScore->setStuntScore($jsonPlayer->stuntsscore);
+				$playerScore->setBestRaceRespawns($jsonPlayer->bestracerespawns);
+				$playerScore->setBestRaceCheckpoints($jsonPlayer->bestracecheckpoints);
+				$playerScore->setBestLapRespawns($jsonPlayer->bestlaprespawns);
+				$playerScore->setBestLapCheckpoints($jsonPlayer->bestlapcheckpoints);
+
+				$this->playerScores[$jsonPlayer->login] = $playerScore;
+			}
 		}
 	}
 }
\ No newline at end of file