From 50547437f77f3d7383bec6d9c4fed4de5aa394dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Fri, 24 Oct 2014 19:54:10 +0200
Subject: [PATCH] fixed null issue

---
 plugins/MCTeam/ServerRankingPlugin.php | 53 ++++++++++++++------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/plugins/MCTeam/ServerRankingPlugin.php b/plugins/MCTeam/ServerRankingPlugin.php
index e32b0024..aa62fc4f 100644
--- a/plugins/MCTeam/ServerRankingPlugin.php
+++ b/plugins/MCTeam/ServerRankingPlugin.php
@@ -49,7 +49,7 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener {
 	 */
 	/** @var ManiaControl $maniaControl * */
 	private $maniaControl = null;
-	private $recordCount = 0;
+	private $recordCount  = 0;
 
 	/**
 	 * @see \ManiaControl\Plugins\Plugin::prepare()
@@ -121,6 +121,23 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener {
 		$this->resetRanks();
 	}
 
+	/**
+	 * Create necessary database tables
+	 */
+	private function initTables() {
+		$mysqli = $this->maniaControl->getDatabase()->getMysqli();
+		$query  = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_RANK . "` (
+				`PlayerIndex` int(11) NOT NULL,
+				`Rank` int(11) NOT NULL,
+				`Avg` float NOT NULL,
+				KEY `PlayerIndex` (`PlayerIndex`),
+				UNIQUE `Rank` (`Rank`)
+				) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='ServerRanking';";
+		$mysqli->query($query);
+		if ($mysqli->error) {
+			throw new \Exception($mysqli->error);
+		}
+	}
 
 	/**
 	 * Get the RankingsTypeArray
@@ -141,24 +158,6 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener {
 		}
 	}
 
-	/**
-	 * Create necessary database tables
-	 */
-	private function initTables() {
-		$mysqli = $this->maniaControl->getDatabase()->getMysqli();
-		$query  = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_RANK . "` (
-				`PlayerIndex` int(11) NOT NULL,
-				`Rank` int(11) NOT NULL,
-				`Avg` float NOT NULL,
-				KEY `PlayerIndex` (`PlayerIndex`),
-				UNIQUE `Rank` (`Rank`)
-				) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='ServerRanking';";
-		$mysqli->query($query);
-		if ($mysqli->error) {
-			throw new \Exception($mysqli->error);
-		}
-	}
-
 	/**
 	 * Resets and rebuilds the Ranking
 	 */
@@ -368,12 +367,18 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener {
 			return false;
 		}
 
+		$nextPlayer = null;
 		if ($rankObject->rank > 1) {
-			$nextRank   = $this->getNextRank($player);
-			$nextPlayer = $this->maniaControl->getPlayerManager()->getPlayerByIndex($nextRank->playerIndex);
-			$message    = '$0f3The next better ranked player is $fff' . $nextPlayer->nickname;
+			$nextRank = $this->getNextRank($player);
+			if ($nextRank) {
+				$nextPlayer = $this->maniaControl->getPlayerManager()->getPlayerByIndex($nextRank->playerIndex);
+			}
+		}
+
+		if ($nextPlayer) {
+			$message = '$0f3The next better ranked player is $fff' . $nextPlayer->getEscapedNickname() . '!';
 		} else {
-			$message = '$0f3No better ranked player :-)';
+			$message = '$0f3No better ranked player.';
 		}
 		$this->maniaControl->getChat()->sendChat($message, $player);
 
@@ -530,7 +535,7 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener {
 			}
 
 			$playerObject = $this->maniaControl->getPlayerManager()->getPlayerByIndex($rankedPlayer->PlayerIndex);
-			$array        = array($rankedPlayer->Rank => $posX + 5, $playerObject->nickname => $posX + 18, (string)round($rankedPlayer->Avg, 2) => $posX + 70);
+			$array        = array($rankedPlayer->Rank => $posX + 5, $playerObject->nickname => $posX + 18, (string) round($rankedPlayer->Avg, 2) => $posX + 70);
 			$this->maniaControl->getManialinkManager()->labelLine($playerFrame, $array);
 
 			$posY -= 4;