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

mapqueue fix, begin mapactions class

Browse Source
This commit is contained in:
kremsy
2014-05-09 11:58:33 +02:00
parent 274384767c
commit a51d5423a3
6 changed files with 79 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/core/Maps/MapList.php
View File

@ -327,7 +327,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
if (isset($queuedMaps[$map->uid])) {
$label = new Label_Text();
$mapFrame->add($label);
$label->setX($width / 2 - 15);
$label->setX($width / 2 - 13);
$label->setAlign(Control::CENTER, Control::CENTER);
$label->setZ(0.2);
$label->setTextSize(1.5);
@ -595,6 +595,8 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$this->maniaControl->mapManager->removeMap($player, $mapUid);
break;
case self::ACTION_SWITCH_MAP:
//Don't queue on Map-Change
$this->maniaControl->mapManager->mapQueue->dontQueueNextMapChange();
try {
$this->maniaControl->client->jumpToMapIdent($mapUid);
} catch (MapNotFoundException $e) {
@ -624,6 +626,9 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$self->maniaControl->chat->sendInformation('$sVote Successfully -> Map switched!');
$votesPlugin->undefineVote('switchmap');
//Don't queue on Map-Change
$this->maniaControl->mapManager->mapQueue->dontQueueNextMapChange();
try {
$self->maniaControl->client->JumpToMapIdent($map->uid);
} catch (MapNotFoundException $e) {