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

Changed Internal Callbacks formats to use objects directly instead of an array

Browse Source
This commit is contained in:
Steffen Schröder
2014-02-19 15:44:00 +01:00
parent 36fc15c7b1
commit ff9c21a8af
31 changed files with 176 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/plugins/CustomVotes.php
View File

@ -107,7 +107,7 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer');
$this->maniaControl->callbackManager->registerCallbackListener(self::CB_CUSTOM_VOTE_FINISHED, $this, 'handleVoteFinished');
$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERCONNECT, $this, 'handlePlayerConnect');
$this->maniaControl->callbackManager->registerCallbackListener(Server::CB_TEAM_STATUS_CHANGED, $this, 'constructMenu');
$this->maniaControl->callbackManager->registerCallbackListener(Server::CB_TEAM_MODE_CHANGED, $this, 'constructMenu');
//Settings
$this->maniaControl->settingManager->initSetting($this, self::SETTING_VOTE_ICON_POSX, 156.);
@ -193,10 +193,9 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
/**
* Handle PlayerConnect callback
*
* @param array $callback
* @param Player $player
*/
public function handlePlayerConnect(array $callback) {
$player = $callback[1];
public function handlePlayerConnect(Player $player) {
$this->showIcon($player->login);
}
@ -482,7 +481,7 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
//Check if vote is over
if ($timeUntilExpire <= 0 || (($playersVoteRatio >= $this->currentVote->neededPlayerRatio) && (($votePercentage >= $this->currentVote->neededRatio) || ($votePercentage <= 1 - $this->currentVote->neededRatio)))) {
// Trigger callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_CUSTOM_VOTE_FINISHED, array(self::CB_CUSTOM_VOTE_FINISHED, $this->currentVote->voteCommand->index, $votePercentage));
$this->maniaControl->callbackManager->triggerCallback(self::CB_CUSTOM_VOTE_FINISHED, $this->currentVote->voteCommand->index, $votePercentage);
//reset vote
$this->destroyVote();

5
application/plugins/Donations.php
View File

@ -176,10 +176,9 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
/**
* Handle PlayerConnect callback
*
* @param array $callback
* @param Player $player
*/
public function handlePlayerConnect(array $callback) {
$player = $callback[1];
public function handlePlayerConnect(Player $player) {
// Display Map Widget
if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_DONATE_WIDGET_ACTIVATED)) {
$this->displayDonateWidget($player->login);

4
application/plugins/DynamicPointlimitPlugin.php
View File

@ -125,9 +125,9 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
/**
* Function called on player connect and disconnect, changing the pointlimit.
*
* @param array $callback
* @param Player $player
*/
public function changePointlimit(array $callback) {
public function changePointlimit(Player $player) {
$numberOfPlayers = 0;
$numberOfSpectators = 0;

8
application/plugins/LocalRecords.php
View File

@ -37,8 +37,8 @@ class LocalRecordsPlugin implements CallbackListener, TimerListener, Plugin {
const SETTING_NOTIFY_BEST_RECORDS = 'Notify Publicly only for the X Best Records';
const SETTING_ADJUST_OUTER_BORDER = 'Adjust outer Border to Number of actual Records';
/**
* Private properties
/*
* Private Properties
*/
/**
*
@ -160,10 +160,8 @@ class LocalRecordsPlugin implements CallbackListener, TimerListener, Plugin {
/**
* Handle ManiaControl After Init
*
* @param array $callback
*/
public function handleAfterInit(array $callback) {
public function handleAfterInit() {
$this->updateManialink = true;
}

6
application/plugins/Obstacle.php
View File

@ -152,8 +152,7 @@ class ObstaclePlugin implements CallbackListener, CommandListener, Plugin {
$time = $data->Run->Time;
// Trigger trackmania player finish callback
$finishCallback = array($player->pid, $player->login, $time);
$finishCallback = array(CallbackManager::CB_TM_PLAYERFINISH, $finishCallback);
$this->maniaControl->callbackManager->triggerCallback(CallbackManager::CB_TM_PLAYERFINISH, $finishCallback);
$this->maniaControl->callbackManager->triggerCallback(CallbackManager::CB_TM_PLAYERFINISH, array(CallbackManager::CB_TM_PLAYERFINISH, $finishCallback));
}
/**
@ -171,7 +170,6 @@ class ObstaclePlugin implements CallbackListener, CommandListener, Plugin {
// Trigger Trackmania player checkpoint callback
// TODO: Checkpoint index (5th element)
$checkpointCallback = array($player->pid, $player->login, $time, 0, 0);
$checkpointCallback = array(CallbackManager::CB_TM_PLAYERCHECKPOINT, $checkpointCallback);
$this->maniaControl->callbackManager->triggerCallback(CallbackManager::CB_TM_PLAYERCHECKPOINT, $checkpointCallback);
$this->maniaControl->callbackManager->triggerCallback(CallbackManager::CB_TM_PLAYERCHECKPOINT, array(CallbackManager::CB_TM_PLAYERCHECKPOINT, $checkpointCallback));
}
}

13
application/plugins/QueuePlugin.php
View File

@ -158,12 +158,9 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
/**
* Function handling on the connection of a player.
*
* @param array $callback
* @param Player $player
*/
public function handlePlayerConnect(array $callback) {
$login = $callback[1]->login;
$player = $this->maniaControl->playerManager->getPlayer($login);
public function handlePlayerConnect(Player $player) {
if($player->isSpectator) {
$this->spectators[$player->login] = $player->login;
$this->maniaControl->client->forceSpectator($player->login, 1);
@ -180,11 +177,9 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
/**
* Function handling on the disconnection of a player.
*
* @param array $callback
* @param Player $player
*/
public function handlePlayerDisconnect(array $callback) {
/** @var Player $player */
$player = $callback[1];
public function handlePlayerDisconnect(Player $player) {
if(isset($this->spectators[$player->login])) {
unset($this->spectators[$player->login]);
}

12
application/plugins/ServerRanking.php
View File

@ -272,18 +272,12 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener {
$mysqli->query($query);
}
/**
* Handle PlayerConnect callback
*
* @param array $callback
* @param Player $player
*/
public function handlePlayerConnect(array $callback) {
$player = $callback[1];
if (!$player) {
return;
}
public function handlePlayerConnect(Player $player) {
$this->showRank($player);
$this->showNextRank($player);
}
@ -306,7 +300,7 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener {
}
// Trigger callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_RANK_BUILT, array(self::CB_RANK_BUILT));
$this->maniaControl->callbackManager->triggerCallback(self::CB_RANK_BUILT);
}
/**

10
application/plugins/SlotMachine.php
View File

@ -152,11 +152,9 @@ class SlotMachinePlugin implements Plugin, CallbackListener, ManialinkPageAnswer
/**
* Handle Player connect
*
* @param array $callback
* @param Player $player
*/
public function handlePlayerConnect(array $callback) {
$player = $callback[1];
/** @var Player $player */
public function handlePlayerConnect(Player $player) {
$this->displayIcon($player->login);
//Initialize Player
$this->playerSettings[$player->index] = array("Balance" => $this->getBalance($player->index), "Won" => 0, "Spent" => 0, "Plays" => 0, "ClicksLastSecond" => 0, "Visible" => 0);
@ -165,12 +163,10 @@ class SlotMachinePlugin implements Plugin, CallbackListener, ManialinkPageAnswer
/**
* Handle Player disconnect
*
* @param array $chatCallback
* @param Player $player
*/
public function handlePlayerDisconnect(array $callback) {
public function handlePlayerDisconnect(Player $player) {
$this->updateDatabaseEveryMinute();
$player = $callback[1];
unset($this->playerSettings[$player->index]);
}

9
application/plugins/WidgetPlugin.php
View File

@ -514,10 +514,9 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin {
/**
* Handle PlayerConnect callback
*
* @param array $callback
* @param Player $player
*/
public function handlePlayerConnect(array $callback) {
$player = $callback[1];
public function handlePlayerConnect(Player $player) {
// Display Map Widget
if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_MAP_WIDGET_ACTIVATED)) {
$this->displayMapWidget($player->login);
@ -533,9 +532,9 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin {
/**
* Handle PlayerConnect callback
*
* @param array $callback
* @param Player $player
*/
public function handlePlayerDisconnect(array $callback) {
public function handlePlayerDisconnect(Player $player) {
if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_SERVERINFO_WIDGET_ACTIVATED)) {
$this->displayServerInfoWidget();
}