From e58bd8648bf3cf26c7c67f98d521de151e9b8833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Sun, 20 Jul 2014 00:24:25 +0200 Subject: [PATCH] prevent errors with non-objects --- application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php index d41c9ff1..a4f13f6a 100644 --- a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php +++ b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php @@ -594,7 +594,6 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene var_dump($responseData); } }, $content, true); - return; } /** @@ -939,13 +938,12 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene * @return bool */ private function insertDedimaniaRecord(RecordData &$newRecord, RecordData $oldRecord) { - if ($newRecord->nullRecord) { + if (!$this->dedimaniaData || !$this->dedimaniaData->records || $newRecord->nullRecord) { return false; } $insert = false; - var_dump($newRecord); // Get max possible rank $maxRank = $this->dedimaniaData->getPlayerMaxRank($newRecord->login); @@ -1167,10 +1165,10 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene /** * Function to retrieve the dedimania records on the current map * - * @return array|RecordData + * @return RecordData[] */ public function getDedimaniaRecords() { - if ($this->dedimaniaData->records) { + if ($this->dedimaniaData && $this->dedimaniaData->records) { return $this->dedimaniaData->records; } return null;