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

Merge pull request #1 from NewboO/master

Browse Source 
Adaptation to new dedicated-api
This commit is contained in:
Lukas Kremsmayr 2014-05-08 19:24:20 +02:00
commit 55850c5ca9
4 changed files with 57 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/core/Maps/MapManager.php
View File

@ -306,7 +306,7 @@ class MapManager implements CallbackListener {
} else { } else {
// Write map via write file method // Write map via write file method
try { try {
$this->maniaControl->client->writeFileFromString($relativeMapFileName, $file); $this->maniaControl->client->writeFile($relativeMapFileName, $file);
} catch (InvalidArgumentException $e) { } catch (InvalidArgumentException $e) {
if ($e->getMessage() == 'data are too big') { if ($e->getMessage() == 'data are too big') {
$this->maniaControl->chat->sendError("Map is too big for a remote save.", $login); $this->maniaControl->chat->sendError("Map is too big for a remote save.", $login);

69
application/core/Players/Player.php
View File

@ -59,36 +59,29 @@ class Player {
public $currentTargetId = 0; public $currentTargetId = 0;
/** /**
* Construct a player from ManiaPlanet Player structure * @param bool $connected
*
* @param \Maniaplanet\DedicatedServer\Structures\Player $mpPlayer
*/ */
public function __construct($mpPlayer) { public function __construct($connected)
if (!$mpPlayer) { {
$this->isConnected = false; $this->isConnected = $connected;
return;
}
if ($connected) {
$this->joinTime = time();
}
}
/**
* Update from ManiaPlanet PlayerInfo structure
* @param \Maniaplanet\DedicatedServer\Structures\PlayerInfo $mpPlayer
*/
public function setInfo($mpPlayer)
{
$this->pid = $mpPlayer->playerId; $this->pid = $mpPlayer->playerId;
$this->login = $mpPlayer->login; $this->login = $mpPlayer->login;
$this->nickname = Formatter::stripDirtyCodes($mpPlayer->nickName); $this->nickname = Formatter::stripDirtyCodes($mpPlayer->nickName);
$this->rawNickname = $mpPlayer->nickName; $this->rawNickname = $mpPlayer->nickName;
$this->path = $mpPlayer->path;
$this->language = $mpPlayer->language;
$this->avatar = $mpPlayer->avatar['FileName'];
$this->allies = $mpPlayer->allies;
$this->clubLink = $mpPlayer->clubLink;
$this->teamId = $mpPlayer->teamId; $this->teamId = $mpPlayer->teamId;
$this->isOfficial = $mpPlayer->isInOfficialMode; $this->isOfficial = $mpPlayer->isInOfficialMode;
$this->ladderScore = $mpPlayer->ladderStats['PlayerRankings'][0]['Score'];
$this->ladderRank = $mpPlayer->ladderStats['PlayerRankings'][0]['Ranking'];
$this->ladderStats = $mpPlayer->ladderStats;
$this->daysSinceZoneInscription = $mpPlayer->hoursSinceZoneInscription / 24;
$this->ipAddress = $mpPlayer->iPAddress;
$this->clientVersion = $mpPlayer->clientVersion;
$this->downloadRate = $mpPlayer->downloadRate;
$this->uploadRate = $mpPlayer->uploadRate;
$this->skins = $mpPlayer->skins;
//Flag Details //Flag Details
$this->forcedSpectatorState = $mpPlayer->forceSpectator; $this->forcedSpectatorState = $mpPlayer->forceSpectator;
@ -108,7 +101,37 @@ class Player {
$this->autoTarget = $mpPlayer->autoTarget; $this->autoTarget = $mpPlayer->autoTarget;
$this->currentTargetId = $mpPlayer->currentTargetId; $this->currentTargetId = $mpPlayer->currentTargetId;
$this->joinTime = time(); if (!$this->nickname) {
$this->nickname = $this->login;
}
}
/**
* Update from ManiaPlanet PlayerDetailedInfo structure
* @param \Maniaplanet\DedicatedServer\Structures\PlayerDetailedInfo $mpPlayer
*/
public function setDetailedInfo($mpPlayer)
{
$this->pid = $mpPlayer->playerId;
$this->login = $mpPlayer->login;
$this->nickname = Formatter::stripDirtyCodes($mpPlayer->nickName);
$this->rawNickname = $mpPlayer->nickName;
$this->path = $mpPlayer->path;
$this->language = $mpPlayer->language;
$this->avatar = $mpPlayer->avatar->fileName;
$this->allies = $mpPlayer->allies;
$this->clubLink = $mpPlayer->clubLink;
$this->teamId = $mpPlayer->teamId;
$this->isOfficial = $mpPlayer->isInOfficialMode;
$this->ladderScore = $mpPlayer->ladderStats->playerRankings[0]->score;
$this->ladderRank = $mpPlayer->ladderStats->playerRankings[0]->ranking;
$this->ladderStats = $mpPlayer->ladderStats;
$this->daysSinceZoneInscription = $mpPlayer->hoursSinceZoneInscription / 24;
$this->ipAddress = $mpPlayer->iPAddress;
$this->clientVersion = $mpPlayer->clientVersion;
$this->downloadRate = $mpPlayer->downloadRate;
$this->uploadRate = $mpPlayer->uploadRate;
$this->skins = $mpPlayer->skins;
if (!$this->nickname) { if (!$this->nickname) {
$this->nickname = $this->login; $this->nickname = $this->login;

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

@ -118,26 +118,16 @@ class PlayerManager implements CallbackListener, TimerListener {
if ($playerItem->playerId <= 0) { if ($playerItem->playerId <= 0) {
continue; continue;
} }
$detailedPlayerInfo = $this->maniaControl->client->getDetailedPlayerInfo($playerItem->login);
$detailedPlayerInfo = $this->maniaControl->client->getDetailedPlayerInfo($playerItem->login);
$playerItem->path = $detailedPlayerInfo->path;
$playerItem->language = $detailedPlayerInfo->language;
$playerItem->clientVersion = $detailedPlayerInfo->clientVersion;
$playerItem->iPAddress = $detailedPlayerInfo->iPAddress;
$playerItem->isSpectator = $detailedPlayerInfo->isSpectator;
$playerItem->avatar = $detailedPlayerInfo->avatar;
$playerItem->ladderStats = $detailedPlayerInfo->ladderStats;
$playerItem->downloadRate = $detailedPlayerInfo->downloadRate;
$playerItem->uploadRate = $detailedPlayerInfo->uploadRate;
$playerItem->hoursSinceZoneInscription = $detailedPlayerInfo->hoursSinceZoneInscription;
//Check if the Player is in a Team, to notify if its a TeamMode or not //Check if the Player is in a Team, to notify if its a TeamMode or not
if ($playerItem->teamId != -1) { if ($playerItem->teamId != -1) {
$this->maniaControl->server->setTeamMode(true); $this->maniaControl->server->setTeamMode(true);
} }
$player = new Player($playerItem); $player = new Player(true);
$player->setInfo($playerItem);
$player->setDetailedInfo($detailedPlayerInfo);
$player->hasJoinedGame = true; $player->hasJoinedGame = true;
$this->addPlayer($player); $this->addPlayer($player);
} }
@ -222,7 +212,8 @@ class PlayerManager implements CallbackListener, TimerListener {
$login = $callback[1][0]; $login = $callback[1][0];
try { try {
$playerInfo = $this->maniaControl->client->getDetailedPlayerInfo($login); $playerInfo = $this->maniaControl->client->getDetailedPlayerInfo($login);
$player = new Player($playerInfo); $player = new Player(true);
$player->setDetailedInfo($playerInfo);
$this->addPlayer($player); $this->addPlayer($player);
} catch (LoginUnknownException $e) { } catch (LoginUnknownException $e) {
@ -403,7 +394,7 @@ class PlayerManager implements CallbackListener, TimerListener {
return null; return null;
} }
$player = new Player(null); $player = new Player(false);
$player->index = $row->index; $player->index = $row->index;
$player->login = $row->login; $player->login = $row->login;
$player->rawNickname = $row->nickname; $player->rawNickname = $row->nickname;
@ -488,7 +479,7 @@ class PlayerManager implements CallbackListener, TimerListener {
return null; return null;
} }
$player = new Player(null); $player = new Player(false);
$player->index = $playerIndex; $player->index = $playerIndex;
$player->login = $row->login; $player->login = $row->login;
$player->rawNickname = $row->nickname; $player->rawNickname = $row->nickname;

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

@ -275,7 +275,7 @@ class Server implements CallbackListener {
/** /**
* Get Server Player Info * Get Server Player Info
* *
* @return \Maniaplanet\DedicatedServer\Structures\Player * @return \Maniaplanet\DedicatedServer\Structures\PlayerInfo
*/ */
public function getInfo() { public function getInfo() {
return $this->maniaControl->client->getMainServerPlayerInfo(); return $this->maniaControl->client->getMainServerPlayerInfo();