beu/TrackManiaControl
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

queue plugin fix for not teammodes

Browse Source
This commit is contained in:
kremsy
2014-08-24 12:56:06 +02:00
parent ffa3506879
commit e63d30605a
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/plugins/TheM/QueuePlugin.php
View File

@@ -19,6 +19,8 @@ use ManiaControl\Players\PlayerActions;
use ManiaControl\Players\PlayerManager; use ManiaControl\Players\PlayerManager;
use ManiaControl\Plugins\Plugin; use ManiaControl\Plugins\Plugin;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
use Maniaplanet\DedicatedServer\Xmlrpc\GameModeException;
use Maniaplanet\DedicatedServer\Xmlrpc\ServerOptionsException;
/** /**
* Queue plugin * Queue plugin
@@ -331,13 +333,13 @@ class QueuePlugin implements CallbackListener, ManialinkPageAnswerListener, Time
* @param Player $player * @param Player $player
*/ */
private function forcePlayerToPlay(Player $player) { private function forcePlayerToPlay(Player $player) {
if ($this->maniaControl->client->getServerPassword() != false && $this->maniaControl->settingManager->getSettingValue($this, self::QUEUE_ACTIVE_ON_PASS) == false) { if ($this->maniaControl->getClient()->getServerPassword() != false && $this->maniaControl->settingManager->getSettingValue($this, self::QUEUE_ACTIVE_ON_PASS) == false) {
return; return;
} }
if ($this->maxPlayers > $this->maniaControl->playerManager->getPlayerCount(true)) { if ($this->maxPlayers > $this->maniaControl->playerManager->getPlayerCount(true)) {
try { try {
$this->maniaControl->client->forceSpectator($player->login, PlayerActions::SPECTATOR_PLAYER); $this->maniaControl->getClient()->forceSpectator($player->login, PlayerActions::SPECTATOR_PLAYER);
} catch (Exception $e) { } catch (Exception $e) {
// TODO: only possible valid exception should be "wrong login" - throw others (like connection error) // TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
$this->maniaControl->chat->sendError("Error while leaving the Queue", $player->login); $this->maniaControl->chat->sendError("Error while leaving the Queue", $player->login);
@@ -345,7 +347,7 @@ class QueuePlugin implements CallbackListener, ManialinkPageAnswerListener, Time
} }
try { try {
$this->maniaControl->client->forceSpectator($player->login, PlayerActions::SPECTATOR_USER_SELECTABLE); $this->maniaControl->getClient()->forceSpectator($player->login, PlayerActions::SPECTATOR_USER_SELECTABLE);
} catch (Exception $e) { } catch (Exception $e) {
// TODO: only possible valid exception should be "wrong login" - throw others (like connection error) // TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
} }
@@ -378,12 +380,16 @@ class QueuePlugin implements CallbackListener, ManialinkPageAnswerListener, Time
} }
} }
try { if ($smallestTeam !== null) {
if ($smallestTeam !== null) { try {
$this->maniaControl->client->forcePlayerTeam($player->login, $smallestTeam); $this->maniaControl->getClient()->forcePlayerTeam($player->login, $smallestTeam);
} catch (GameModeException $e) {
try {
$this->maniaControl->getClient()->forceSpectator($player->login, PlayerActions::SPECTATOR_PLAYER);
$this->maniaControl->getClient()->forceSpectator($player->login, PlayerActions::SPECTATOR_USER_SELECTABLE);
} catch (ServerOptionsException $e) {
}
} }
} catch (Exception $e) {
$this->maniaControl->errorHandler->triggerDebugNotice("QueuePlugin line 383 Exception" . $e->getTraceAsString());
} }
if (isset($this->spectators[$player->login])) { if (isset($this->spectators[$player->login])) {