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

playermanager addition

Browse Source
This commit is contained in:
kremsy 2014-04-20 19:59:01 +02:00 committed by Steffen Schröder
parent fa1f8663f3
commit e899b1c245
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,14 +9,14 @@ use ManiaControl\Callbacks\TimerListener;
use ManiaControl\Formatter; use ManiaControl\Formatter;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\Statistics\StatisticManager; use ManiaControl\Statistics\StatisticManager;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; use Maniaplanet\DedicatedServer\Xmlrpc\LoginUnknownException;
/** /**
* Class managing Players * Class managing Players
* *
* @author kremsy & steeffeen * @author kremsy & steeffeen
* @copyright ManiaControl Copyright © 2014 ManiaControl Team * @copyright ManiaControl Copyright © 2014 ManiaControl Team
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
*/ */
class PlayerManager implements CallbackListener, TimerListener { class PlayerManager implements CallbackListener, TimerListener {
/* /*
@ -152,10 +152,7 @@ class PlayerManager implements CallbackListener, TimerListener {
$player = new Player($playerInfo); $player = new Player($playerInfo);
$this->addPlayer($player); $this->addPlayer($player);
} catch(Exception $e) { } catch(LoginUnknownException $e) {
if ($e->getMessage() != 'Login unknown.') {
throw $e;
}
} }
} }
@ -167,12 +164,15 @@ class PlayerManager implements CallbackListener, TimerListener {
public function playerDisconnect(array $callback) { public function playerDisconnect(array $callback) {
$login = $callback[1][0]; $login = $callback[1][0];
$player = $this->removePlayer($login); $player = $this->removePlayer($login);
if (!$player) return; if (!$player) {
return;
}
// Trigger own callback // Trigger own callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERDISCONNECT, $player); $this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERDISCONNECT, $player);
if ($player->isFakePlayer()) return; if ($player->isFakePlayer())
return;
$played = Formatter::formatTimeH(time() - $player->joinTime); $played = Formatter::formatTimeH(time() - $player->joinTime);
$logMessage = "Player left: {$player->login} / {$player->nickname} Playtime: {$played}"; $logMessage = "Player left: {$player->login} / {$player->nickname} Playtime: {$played}";
@ -190,7 +190,8 @@ class PlayerManager implements CallbackListener, TimerListener {
*/ */
public function playerInfoChanged(array $callback) { public function playerInfoChanged(array $callback) {
$player = $this->getPlayer($callback[1][0]['Login']); $player = $this->getPlayer($callback[1][0]['Login']);
if (!$player) return; if (!$player)
return;
$player->ladderRank = $callback[1][0]["LadderRanking"]; $player->ladderRank = $callback[1][0]["LadderRanking"];
$player->teamId = $callback[1][0]["TeamId"]; $player->teamId = $callback[1][0]["TeamId"];
@ -275,16 +276,21 @@ class PlayerManager implements CallbackListener, TimerListener {
/** /**
* Gets a Player by his index * Gets a Player by his index
* *
* @param $index * @param $index
* @param bool $connectedPlayersOnly
* @return Player|null * @return Player|null
*/ */
public function getPlayerByIndex($index) { public function getPlayerByIndex($index, $connectedPlayersOnly = false) {
foreach($this->players as $player) { foreach($this->players as $player) {
/** @var Player $player */ /** @var Player $player */
if ($player->index == $index) { if ($player->index == $index) {
return $player; return $player;
} }
} }
if ($connectedPlayersOnly) {
return null;
}
//Player is not online -> get Player from Database //Player is not online -> get Player from Database
return $this->getPlayerFromDatabaseByIndex($index); return $this->getPlayerFromDatabaseByIndex($index);
} }
@ -293,10 +299,14 @@ class PlayerManager implements CallbackListener, TimerListener {
* Get a Player by Login * Get a Player by Login
* *
* @param string $login * @param string $login
* @return \ManiaControl\Players\Player * @param bool $connectedPlayersOnly
* @return Player|null
*/ */
public function getPlayer($login) { public function getPlayer($login, $connectedPlayersOnly = false) {
if (!isset($this->players[$login])) { if (!isset($this->players[$login])) {
if ($connectedPlayersOnly) {
return null;
}
return $this->getPlayerFromDatabaseByLogin($login); return $this->getPlayerFromDatabaseByLogin($login);
} }
return $this->players[$login]; return $this->players[$login];