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

queue plugin fix

Browse Source
This commit is contained in:
kremsy 2014-02-01 19:32:17 +01:00 committed by Steffen Schröder
parent e792c706c7
commit 737b3f8507
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/plugins/QueuePlugin.php
View File

@ -24,7 +24,7 @@ use ManiaControl\Plugins\Plugin;
// TODO: worst kick function // TODO: worst kick function
// TODO: idlekick function (?) // TODO: idlekick function (?)
class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAnswerListener, TimerListener , Plugin { class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAnswerListener, TimerListener, Plugin {
/** /**
* Constants * Constants
*/ */
@ -99,9 +99,9 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
$this->hideQueueWidget($player); $this->hideQueueWidget($player);
} }
$this->queue = array(); $this->queue = array();
$this->spectators = array(); $this->spectators = array();
$this->showPlay = array(); $this->showPlay = array();
unset($this->maniaControl); unset($this->maniaControl);
} }
@ -283,8 +283,19 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
*/ */
private function forcePlayerToPlay(Player $player) { private function forcePlayerToPlay(Player $player) {
if ($this->maniaControl->client->getMaxPlayers()['CurrentValue'] > (count($this->maniaControl->playerManager->players) - count($this->spectators))) { if ($this->maniaControl->client->getMaxPlayers()['CurrentValue'] > (count($this->maniaControl->playerManager->players) - count($this->spectators))) {
$this->maniaControl->client->forceSpectator($player->login, 2); try {
$this->maniaControl->client->forceSpectator($player->login, 0); $this->maniaControl->client->forceSpectator($player->login, 2);
} catch(\Exception $e) {
$this->maniaControl->chat->sendError("Error while leaving the Queue", $player->login);
return;
}
try {
$this->maniaControl->client->forceSpectator($player->login, 0);
} catch(\Exception $e) {
//do nothing
}
if (isset($this->spectators[$player->login])) { if (isset($this->spectators[$player->login])) {
unset($this->spectators[$player->login]); unset($this->spectators[$player->login]);
} }
@ -292,6 +303,7 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
$this->showPlayWidget($player); $this->showPlayWidget($player);
$this->maniaControl->chat->sendChat('$z$s$090[Queue] $<$fff' . $player->nickname . '$> has a free spot and is now playing!'); $this->maniaControl->chat->sendChat('$z$s$090[Queue] $<$fff' . $player->nickname . '$> has a free spot and is now playing!');
} }
} }
/** /**