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

revert match settings manager (nevermind)

Browse Source
This commit is contained in:
Steffen Schröder
2014-05-11 16:02:29 +02:00
parent 0834d2c587
commit f9df0fc325
10 changed files with 67 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/core/Players/PlayerCommands.php
View File

@ -9,7 +9,7 @@ use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Commands\CommandListener;
use ManiaControl\ManiaControl;
use ManiaControl\Manialinks\ManialinkPageAnswerListener;
use ManiaControl\Server\MatchSettingsManager;
use ManiaControl\Server\Server;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
/**
@ -62,7 +62,7 @@ class PlayerCommands implements CommandListener, ManialinkPageAnswerListener, Ca
$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_TEAM_BALANCE, AuthenticationManager::AUTH_LEVEL_MODERATOR);
//CallbackManager
$this->maniaControl->callbackManager->registerCallbackListener(MatchSettingsManager::CB_TEAM_MODE_CHANGED, $this, 'teamStatusChanged');
$this->maniaControl->callbackManager->registerCallbackListener(Server::CB_TEAM_MODE_CHANGED, $this, 'teamStatusChanged');
// Action Open Playerlist
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_OPEN_PLAYERLIST, $this, 'command_playerList');

2
application/core/Players/PlayerList.php
View File

@ -326,7 +326,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$playerQuad->addTooltipLabelFeature($descriptionLabel, $description);
}
if ($this->maniaControl->server->matchSettingsManager->isTeamMode()) {
if ($this->maniaControl->server->isTeamMode()) {
if ($this->maniaControl->authenticationManager->checkPermission($player, PlayerActions::SETTING_PERMISSION_FORCE_PLAYER_TEAM)) {
// Force to Red-Team Quad
$redQuad = new Quad_Emblems();

4
application/core/Players/PlayerManager.php
View File

@ -122,7 +122,7 @@ class PlayerManager implements CallbackListener, TimerListener {
//Check if the Player is in a Team, to notify if its a TeamMode or not
if ($playerItem->teamId != -1) {
$this->maniaControl->server->matchSettingsManager->setTeamMode(true);
$this->maniaControl->server->setTeamMode(true);
}
$player = new Player($this->maniaControl, true);
@ -321,7 +321,7 @@ class PlayerManager implements CallbackListener, TimerListener {
//Check if the Player is in a Team, to notify if its a TeamMode or not
if ($player->teamId != -1) {
$this->maniaControl->server->matchSettingsManager->setTeamMode(true);
$this->maniaControl->server->setTeamMode(true);
}
$prevJoinState = $player->hasJoinedGame;