From 908e310fce60809add97ce9a2969116478712005 Mon Sep 17 00:00:00 2001 From: kremsy Date: Sat, 11 Jul 2015 14:06:18 +0200 Subject: [PATCH] added playeractions to communication listenings --- changelog.txt | 1 + core/Communication/CommunicationMethods.php | 19 +++++ core/Maps/MapActions.php | 93 ++++++++++++++++++++- 3 files changed, 112 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 9c12c3a6..065a90a2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -14,6 +14,7 @@ - added Method getServerLoginByIndex to Server object - added to PlayerManager's Method PlayerManager the Parameter "withoutBots" (default on true) - added Method getSpectators() in PlayerManager +- added Method restartMap(), skipToMapByMxId(), skipToMapByUid() into MapActions - added some missing PHP Docs - added some depency libraries as they are used by the Socket Handler - added additional Callback which gets triggered on ManiaControl Restart diff --git a/core/Communication/CommunicationMethods.php b/core/Communication/CommunicationMethods.php index 689b1b3c..67a58de6 100644 --- a/core/Communication/CommunicationMethods.php +++ b/core/Communication/CommunicationMethods.php @@ -16,6 +16,25 @@ interface CommunicationMethods { */ const RESTART_MANIA_CONTROL = "ManiaControl.Restart"; + + /** Restarts the Current Map + * no Parameters + */ + const RESTART_MAP = "MapActions.RestartMap"; + + /** Skips the Current Map + * no Parameters + */ + const SKIP_MAP = "MapActions.SkipMap"; + + /** Skips to a Specific Map by MxId or MapUid + * Required Parameters + * - mxId + * OR + * - mapUid + */ + const SKIP_TO_MAP = "MapActions.SkipToMap"; + /** Adds a Map from Mania Exchange to the Server * Required Parameters * - mxId diff --git a/core/Maps/MapActions.php b/core/Maps/MapActions.php index 5807121e..0eac0749 100644 --- a/core/Maps/MapActions.php +++ b/core/Maps/MapActions.php @@ -2,6 +2,9 @@ namespace ManiaControl\Maps; +use ManiaControl\Communication\CommunicationAnswer; +use ManiaControl\Communication\CommunicationListener; +use ManiaControl\Communication\CommunicationMethods; use ManiaControl\ManiaControl; use Maniaplanet\DedicatedServer\Xmlrpc\ChangeInProgressException; @@ -12,7 +15,7 @@ use Maniaplanet\DedicatedServer\Xmlrpc\ChangeInProgressException; * @copyright 2014-2015 ManiaControl Team * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ -class MapActions { +class MapActions implements CommunicationListener { /* * Private properties */ @@ -26,12 +29,79 @@ class MapActions { */ public function __construct(ManiaControl $maniaControl) { $this->maniaControl = $maniaControl; + + //Communication Listenings + $this->maniaControl->getCommunicationManager()->registerCommunicationListener(CommunicationMethods::SKIP_MAP, $this, function ($data) { + $success = $this->skipMap(); + return new CommunicationAnswer(array("success" => $success)); + }); + + $this->maniaControl->getCommunicationManager()->registerCommunicationListener(CommunicationMethods::RESTART_MAP, $this, function ($data) { + $success = $this->restartMap(); + return new CommunicationAnswer(array("success" => $success)); + }); + + $this->maniaControl->getCommunicationManager()->registerCommunicationListener(CommunicationMethods::SKIP_TO_MAP, $this, function ($data) { + if (!is_object($data)) { + return new CommunicationAnswer("Error in provided Data", true); + } + + if (property_exists($data, "mxId")) { + $success = $this->skipToMapByMxId($data->mxId); + } else if (property_exists($data, "mapUid")) { + $success = $this->skipToMapByUid($data->mapUid); + } else { + return new CommunicationAnswer("No mxId or mapUid provided.", true); + } + + return new CommunicationAnswer(array("success" => $success)); + }); + } + + /** + * Skips to a Map by its given UID + * + * @param String $uid + * @return bool + */ + public function skipToMapByUid($uid) { + //TODO message + //Check if Map exists + $map = $this->maniaControl->getMapManager()->getMapByUid($uid); + if (!$map) { + return false; + } + + try { + $this->maniaControl->getClient()->jumpToMapIdent($uid); + } catch (ChangeInProgressException $e) { + return false; + } + return true; + } + + /** + * Skips to a Map by its given MxId + * + * @param int $mxId + * @return bool + */ + public function skipToMapByMxId($mxId) { + $map = $this->maniaControl->getMapManager()->getMapByMxId($mxId); + if (!$map) { + return false; + } + return $this->skipToMapByUid($map->uid); } /** * Skip the current Map + * + * @return bool */ public function skipMap() { + //TODO message + // Force an EndMap on the MapQueue to set the next Map $this->maniaControl->getMapManager()->getMapQueue()->endMap(null); @@ -42,6 +112,27 @@ class MapActions { try { $this->maniaControl->getClient()->nextMap(); } catch (ChangeInProgressException $e) { + return false; } + + return true; + } + + /** + * Restarts the Current Map + * + * @return bool + */ + public function restartMap() { + //TODO message + + //Restarts the Current Map + try { + $this->maniaControl->getClient()->restartMap(); + } catch (ChangeInProgressException $e) { + return false; + } + + return true; } }