From 7d2e87f07796a0e76106e0ebdbd8af18c13e5e52 Mon Sep 17 00:00:00 2001 From: kremsy Date: Thu, 20 Feb 2014 13:49:33 +0100 Subject: [PATCH] dedi continue --- application/core/Players/PlayerManager.php | 1 - application/core/Server/Server.php | 16 ++-- application/plugins/Dedimania/Dedimania.php | 87 +++++++++------------ 3 files changed, 46 insertions(+), 58 deletions(-) diff --git a/application/core/Players/PlayerManager.php b/application/core/Players/PlayerManager.php index 4cfbac90..63a6593b 100644 --- a/application/core/Players/PlayerManager.php +++ b/application/core/Players/PlayerManager.php @@ -208,7 +208,6 @@ class PlayerManager implements CallbackListener { //Check if Player finished joining the game if ($player->hasJoinedGame && !$prevJoinState) { - var_dump("test1234"); if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_JOIN_LEAVE_MESSAGES) && !$player->isFakePlayer()) { $string = array(0 => '$0f0Player', 1 => '$0f0Moderator', 2 => '$0f0Admin', 3 => '$0f0SuperAdmin', 4 => '$0f0MasterAdmin'); $chatMessage = '$s$0f0' . $string[$player->authLevel] . ' $fff' . $player->nickname . '$z$s$0f0 Nation:$fff ' . $player->getCountry() . ' $z$s$0f0joined!'; diff --git a/application/core/Server/Server.php b/application/core/Server/Server.php index 56a627fd..d5ee78ed 100644 --- a/application/core/Server/Server.php +++ b/application/core/Server/Server.php @@ -242,14 +242,14 @@ class Server implements CallbackListener { /** * Retrieve Validation Replay for the given Player * - * @param Player $player + * @param $login * @return string */ - public function getValidationReplay(Player $player) { + public function getValidationReplay($login) { try { - $replay = $this->maniaControl->client->getValidationReplay($player->login); + $replay = $this->maniaControl->client->getValidationReplay($login); } catch(Exception $e) { - trigger_error("Couldn't get validation replay of '{$player->login}'. " . $e->getMessage()); + trigger_error("Couldn't get validation replay of '{$login}'. " . $e->getMessage()); return null; } return $replay; @@ -258,10 +258,10 @@ class Server implements CallbackListener { /** * Retrieve Ghost Replay for the given Player * - * @param Player $player + * @param $login * @return string */ - public function getGhostReplay(Player $player) { + public function getGhostReplay($login) { $dataDir = $this->getDataDirectory(); if (!$this->checkAccess($dataDir)) { return null; @@ -271,11 +271,11 @@ class Server implements CallbackListener { $map = $this->maniaControl->mapManager->getCurrentMap(); $gameMode = $this->getGameMode(); $time = time(); - $fileName = "GhostReplays/Ghost.{$player->login}.{$gameMode}.{$time}.{$map->uid}.Replay.Gbx"; + $fileName = "GhostReplays/Ghost.{$login}.{$gameMode}.{$time}.{$map->uid}.Replay.Gbx"; // Save ghost replay try { - $this->maniaControl->client->saveBestGhostsReplay($player->login, $fileName); + $this->maniaControl->client->saveBestGhostsReplay($login, $fileName); } catch(Exception $e) { trigger_error("Couldn't save ghost replay. " . $e->getMessage()); return null; diff --git a/application/plugins/Dedimania/Dedimania.php b/application/plugins/Dedimania/Dedimania.php index 8063b5e3..4f43b67d 100644 --- a/application/plugins/Dedimania/Dedimania.php +++ b/application/plugins/Dedimania/Dedimania.php @@ -167,11 +167,9 @@ class Dedimania implements CallbackListener, TimerListener, Plugin { if (!$this->updateManialink) { return; } - var_dump($this->dedimaniaData->records); if (!$this->dedimaniaData->records) { return; } - var_dump("update"); $this->updateManialink = false; @@ -305,19 +303,25 @@ class Dedimania implements CallbackListener, TimerListener, Plugin { if (!isset($replays['Top1GReplay'])) { $replays['Top1GReplay'] = ''; } + //$replays['VReplay'] = ''; + $replays['Top1GReplay'] = ''; + $replays['VReplay'] = base64_encode($replays['VReplay']); + //$replays['Top1GReplay'] = base64_encode($replays['Top1GReplay']); + //xmlrpc_set_type($replays['VReplay'], 'base64'); + //xmlrpc_set_type($replays['Top1GReplay'], 'base64'); - xmlrpc_set_type($replays['VReplay'], 'base64'); - xmlrpc_set_type($replays['Top1GReplay'], 'base64'); - + var_dump($replays); $data = array($this->dedimaniaData->sessionId, $this->getMapInfo(), $gameMode, $times, $replays); + //var_dump($data); $content = $this->encode_request(self::DEDIMANIA_SETCHALLENGETIMES, $data); $this->maniaControl->fileReader->postData(self::DEDIMANIA_URL, function ($data, $error) { if ($error != '') { $this->maniaControl->log("Dedimania Error: " . $error); } - + var_dump($data); $data = $this->decode($data); + var_dump($data); if (is_array($data)) { foreach($data as $index => $methodResponse) { if (xmlrpc_is_fault($methodResponse)) { @@ -420,55 +424,40 @@ class Dedimania implements CallbackListener, TimerListener, Plugin { $oldRecord = $this->getDedimaniaRecord($login); - - $save = true; + $save = true; if ($oldRecord) { if ($oldRecord['Best'] <= $time) { $save = false; } - - if ($save) { - $player = $this->maniaControl->playerManager->getPlayer($login); - // Save time - $newRecord = array('Login' => $login, 'NickName' => $player->nickname, 'Best' => $data[2], 'Checks' => $this->getCheckpoints($login), 'New' => true); - if ($this->insertDedimaniaRecord($newRecord, $oldRecord)) { - $this->displayRecordData($player, $oldRecord, $newRecord); + } + if ($save) { + $player = $this->maniaControl->playerManager->getPlayer($login); + // Save time + $newRecord = array('Login' => $login, 'NickName' => $player->nickname, 'Best' => $data[2], 'Checks' => $this->getCheckpoints($login), 'New' => true); + if ($this->insertDedimaniaRecord($newRecord, $oldRecord)) { + // Get newly saved record + foreach($this->dedimaniaData->records['Records'] as &$record) { + if ($record['Login'] !== $newRecord['Login']) { + continue; + } + $newRecord = $record; + break; } + + // Announce record + if (!$oldRecord || $newRecord['Rank'] < $oldRecord['Rank']) { + // Gained rank + $improvement = 'gained the'; + } else { + // Only improved time + $improvement = 'improved her/his'; + } + $message = '$<' . $player->nickname . '$> ' . $improvement . ' $<$o' . $newRecord['Rank'] . '.$> Dedimania Record: ' . Formatter::formatTime($newRecord['Best']); + $this->maniaControl->chat->sendInformation($message); + + $this->updateManialink = true; } } - - } - - /** - * Display the Record Data - * - * @param $player - * @param $oldRecord - * @param $newRecord - */ - private function displayRecordData($player, $oldRecord, $newRecord) { - // Get newly saved record - foreach($this->dedimaniaData['records']['Records'] as &$record) { - if ($record['Login'] !== $newRecord['Login']) { - continue; - } - $newRecord = $record; - break; - } - - // Announce record - if (!$oldRecord || $newRecord['Rank'] < $oldRecord['Rank']) { - // Gained rank - $improvement = 'gained the'; - } else { - // Only improved time - $improvement = 'improved her/his'; - } - $message = '$<' . $player['NickName'] . '$> ' . $improvement . ' $<$o' . $newRecord['Rank'] . '.$> Dedimania Record: ' . Formatter::formatTime($newRecord['Best']); - $this->maniaControl->chat->sendInformation($message); - - $this->updateManialink = true; - } /** @@ -643,7 +632,7 @@ class Dedimania implements CallbackListener, TimerListener, Plugin { * Update the sorting and the ranks of all dedimania records */ private function updateDedimaniaRecordRanks() { - if (!$this->dedimaniaData->records|| !isset($this->dedimaniaData->records['Records'])) { + if (!$this->dedimaniaData->records || !isset($this->dedimaniaData->records['Records'])) { return; }