refactor codestyle (chaining)

This commit is contained in:
kremsy
2014-08-13 11:05:52 +02:00
parent 699c5951d9
commit 22915bb934
56 changed files with 1572 additions and 3132 deletions

View File

@ -42,8 +42,7 @@ class TrackManiaCallbacks implements CallbackListener {
*/
public function handleOnWayPointCallback(array $callback) {
$login = $callback[0];
$player = $this->maniaControl->getPlayerManager()
->getPlayer($login);
$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
if (!$player) {
return;
}
@ -62,8 +61,7 @@ class TrackManiaCallbacks implements CallbackListener {
$wayPointCallback->isEndLap = Formatter::parseBoolean($callback[7]);
if ($wayPointCallback->checkpoint > 0) {
$currentMap = $this->maniaControl->getMapManager()
->getCurrentMap();
$currentMap = $this->maniaControl->getMapManager()->getCurrentMap();
$wayPointCallback->lap += $wayPointCallback->checkpoint / $currentMap->nbCheckpoints;
}
@ -75,8 +73,7 @@ class TrackManiaCallbacks implements CallbackListener {
$wayPointCallback->name = $wayPointCallback::CHECKPOINT;
}
$this->maniaControl->getCallbackManager()
->triggerCallback($wayPointCallback);
$this->maniaControl->getCallbackManager()->triggerCallback($wayPointCallback);
}
/**
@ -87,8 +84,7 @@ class TrackManiaCallbacks implements CallbackListener {
public function handlePlayerCheckpointCallback(array $callback) {
$data = $callback[1];
$login = $data[1];
$player = $this->maniaControl->getPlayerManager()
->getPlayer($login);
$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
if (!$player) {
return;
}
@ -104,8 +100,7 @@ class TrackManiaCallbacks implements CallbackListener {
$checkpointCallback->lapCheckpoint = $checkpointCallback->checkpoint;
if ($checkpointCallback->lap > 0) {
$currentMap = $this->maniaControl->getMapManager()
->getCurrentMap();
$currentMap = $this->maniaControl->getMapManager()->getCurrentMap();
$checkpointCallback->lapCheckpoint -= $checkpointCallback->lap * $currentMap->nbCheckpoints;
}
@ -115,8 +110,7 @@ class TrackManiaCallbacks implements CallbackListener {
$checkpointCallback->name = $checkpointCallback::CHECKPOINT;
}
$this->maniaControl->getCallbackManager()
->triggerCallback($checkpointCallback);
$this->maniaControl->getCallbackManager()->triggerCallback($checkpointCallback);
}
/**
@ -127,8 +121,7 @@ class TrackManiaCallbacks implements CallbackListener {
public function handlePlayerFinishCallback(array $callback) {
$data = $callback[1];
$login = $data[1];
$player = $this->maniaControl->getPlayerManager()
->getPlayer($login);
$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
if (!$player) {
return;
}
@ -141,7 +134,6 @@ class TrackManiaCallbacks implements CallbackListener {
$finishCallback->setPlayer($player);
$finishCallback->time = (int)$data[2];
$this->maniaControl->getCallbackManager()
->triggerCallback($finishCallback);
$this->maniaControl->getCallbackManager()->triggerCallback($finishCallback);
}
}