From 68edd009fc7c2ebced881e9f2668a797186848c8 Mon Sep 17 00:00:00 2001
From: kremsy <lukas@kremsmayr.net>
Date: Thu, 26 Mar 2020 21:40:20 +0100
Subject: [PATCH] fixed pause vote and start for combo

---
 core/Server/Commands.php              | 5 +++--
 plugins/MCTeam/CustomVotesPlugin.php  | 3 ++-
 plugins/MCTeam/LocalRecordsPlugin.php | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/Server/Commands.php b/core/Server/Commands.php
index 6595bef8..49fe572a 100644
--- a/core/Server/Commands.php
+++ b/core/Server/Commands.php
@@ -16,6 +16,7 @@ use ManiaControl\Logger;
 use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\ManialinkPageAnswerListener;
 use ManiaControl\Players\Player;
+use Maniaplanet\DedicatedServer\Xmlrpc\FaultException;
 use Maniaplanet\DedicatedServer\Xmlrpc\GameModeException;
 
 /**
@@ -225,7 +226,7 @@ class Commands implements CallbackListener, CommandListener, ManialinkPageAnswer
 		try {
 			$this->maniaControl->getClient()->sendModeScriptCommands(array('Command_ForceWarmUp' => true));
 			$this->maniaControl->getChat()->sendInformation($player->getEscapedNickname() . ' paused the Game!');
-		} catch (GameModeException $e) {
+		} catch (GameModeException | FaultException $e) {
 		}
 
 		try {
@@ -235,7 +236,7 @@ class Commands implements CallbackListener, CommandListener, ManialinkPageAnswer
 
 			//Especially for chase, force end of the round to reach a draw
 			$this->maniaControl->getClient()->sendModeScriptCommands(array('Command_ForceEndRound' => true));
-		} catch (GameModeException $ex) {
+		} catch (GameModeException | FaultException $ex) {
 		}
 
 		//TODO verify if not everything is replaced through the new pause
diff --git a/plugins/MCTeam/CustomVotesPlugin.php b/plugins/MCTeam/CustomVotesPlugin.php
index 4ff6f0ee..32af0d4a 100644
--- a/plugins/MCTeam/CustomVotesPlugin.php
+++ b/plugins/MCTeam/CustomVotesPlugin.php
@@ -37,6 +37,7 @@ use ManiaControl\Settings\SettingManager;
 use ManiaControl\Utils\ColorUtil;
 use Maniaplanet\DedicatedServer\Structures\VoteRatio;
 use Maniaplanet\DedicatedServer\Xmlrpc\ChangeInProgressException;
+use Maniaplanet\DedicatedServer\Xmlrpc\FaultException;
 use Maniaplanet\DedicatedServer\Xmlrpc\GameModeException;
 
 
@@ -524,7 +525,7 @@ class CustomVotesPlugin implements SidebarMenuEntryListener, CommandListener, Ca
 						//Gamemodes like Elite, Speedball
 						$this->maniaControl->getClient()->sendModeScriptCommands(array('Command_ForceWarmUp' => true));
 						$this->maniaControl->getChat()->sendInformation('$f8fVote to $fffpause the current Game$f8f has been successful!');
-					} catch (GameModeException $ex) {
+					} catch (GameModeException | FaultException $ex) {
 					}
 
 					//TODO verify if not everything is replaced through the new pause
diff --git a/plugins/MCTeam/LocalRecordsPlugin.php b/plugins/MCTeam/LocalRecordsPlugin.php
index ce26e97e..8bf952c4 100644
--- a/plugins/MCTeam/LocalRecordsPlugin.php
+++ b/plugins/MCTeam/LocalRecordsPlugin.php
@@ -34,7 +34,7 @@ use MCTeam\Common\RecordWidget;
  * ManiaControl Local Records Plugin
  *
  * @author    ManiaControl Team <mail@maniacontrol.com>
- * @copyright 2014-2019 ManiaControl Team
+ * @copyright 2014-2020 ManiaControl Team
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
 class LocalRecordsPlugin implements CallbackListener, CallQueueListener, CommandListener, ManialinkPageAnswerListener, TimerListener, Plugin {