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

begin new structure

Browse Source
This commit is contained in:
kremsy
2014-01-16 18:08:32 +01:00
committed by Steffen Schröder
parent 5a2d849137
commit af16f2ac8d
7 changed files with 88 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/core/Server/Server.php
View File

@ -6,6 +6,7 @@ use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\Structures\SystemInfos;
require_once __DIR__ . '/ServerCommands.php';
@ -59,11 +60,11 @@ class Server implements CallbackListener {
private function updateProperties() {
// System info
$systemInfo = $this->getSystemInfo();
$this->ip = $systemInfo['PublishedIp'];
$this->port = $systemInfo['Port'];
$this->p2pPort = $systemInfo['P2PPort'];
$this->login = $systemInfo['ServerLogin'];
$this->titleId = $systemInfo['TitleId'];
$this->ip = $systemInfo->publishedIp;
$this->port = $systemInfo->port;
$this->p2pPort = $systemInfo->p2PPort;
$this->login = $systemInfo->serverLogin;
$this->titleId = $systemInfo->titleId;
// Database index
$mysqli = $this->maniaControl->database->mysqli;
@ -231,7 +232,7 @@ class Server implements CallbackListener {
/**
* Fetch Server System Info
*
* @return array
* @return SystemInfos
*/
public function getSystemInfo() {
if(!$systemInfo = $this->maniaControl->client->getSystemInfo()) {
@ -309,7 +310,7 @@ class Server implements CallbackListener {
}
// Build file name
$map = $this->getMap(); //TODO does that work?=
$map = $this->getMap(); //TODO does that workm, where is the method?=
$gameMode = $this->getGameMode();
$time = time();
$fileName = "GhostReplays/Ghost.{$player->login}.{$gameMode}.{$time}.{$map['UId']}.Replay.Gbx";

26
application/core/Server/ServerCommands.php
View File

@ -64,16 +64,17 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
*/
public function handleOnInit(array $callback) {
//Check if Pause exists in current gamemode
$this->maniaControl->client->query('GetModeScriptInfo');
$scriptInfos = $this->maniaControl->client->getResponse();
$scriptInfos = $this->maniaControl->client->getModeScriptInfo();
$pauseExists = false;
foreach($scriptInfos["CommandDescs"] as $param) {
/*foreach($scriptInfos['commandDescs'] as $param) {
if($param['Name'] == "Command_ForceWarmUp") {
$pauseExists = true;
break;
}
}
}*/ //TODO temp
$pauseExists = true;
// Set Pause
if($pauseExists) {
$itemQuad = new Quad_Icons128x32_1();
@ -101,7 +102,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
$this->maniaControl->authenticationManager->sendNotAllowed($player);
return;
}
$success = $this->maniaControl->client->query('CancelVote');
$success = $this->maniaControl->client->cancelVote();
if(!$success) {
$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);
return;
@ -118,8 +119,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
* @param array $callback
*/
public function setPause(array $callback) {
$this->maniaControl->client->query('SendModeScriptCommands', array('Command_ForceWarmUp' => True));
$success = $this->maniaControl->client->getResponse();
$success = $this->maniaControl->client->sendModeScriptCommands(array('Command_ForceWarmUp' => True));
if(!$success) {
$this->maniaControl->chat->sendError("Error while setting the pause");
}
@ -220,7 +220,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
return;
}
$serverName = $params[1];
if(!$this->maniaControl->client->query('SetServerName', $serverName)) {
if(!$this->maniaControl->client->setServerName($serverName)) {
$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);
return;
}
@ -245,7 +245,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
$password = $messageParts[1];
$successMessage = "Password changed to: '{$password}'!";
}
$success = $this->maniaControl->client->query('SetServerPassword', $password);
$success = $this->maniaControl->client->setServerPassword($password);
if(!$success) {
$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);
return;
@ -271,7 +271,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
$password = $messageParts[1];
$successMessage = "Spectator password changed to: '{$password}'!";
}
$success = $this->maniaControl->client->query('SetServerPasswordForSpectator', $password);
$success = $this->maniaControl->client->setServerPasswordForSpectator($password);
if(!$success) {
$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);
return;
@ -304,7 +304,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
if($amount < 0) {
$amount = 0;
}
$success = $this->maniaControl->client->query('SetMaxPlayers', $amount);
$success = $this->maniaControl->client->setMaxPlayers($amount);
if(!$success) {
$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);
return;
@ -337,7 +337,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
if($amount < 0) {
$amount = 0;
}
$success = $this->maniaControl->client->query('SetMaxSpectators', $amount);
$success = $this->maniaControl->client->setMaxSpectators($amount);
if(!$success) {
$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);
return;
@ -352,7 +352,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage
* @return bool
*/
private function shutdownServer($login = '#') {
if(!$this->maniaControl->client->query('StopServer')) {
if(!$this->maniaControl->client->stopServer()) {
trigger_error("Server shutdown command from '{login}' failed. " . $this->maniaControl->getClientErrorText());
return false;
}