Fixed chatbugs

This commit is contained in:
Max Klaversma 2014-04-30 18:40:21 +02:00 committed by Steffen Schröder
parent b55b4da7f9
commit 1f988ab27e
2 changed files with 25 additions and 25 deletions

View File

@ -107,9 +107,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iHello $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iHello $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iHello All!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iHello All!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
} }
@ -124,9 +124,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iBye $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBye $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iI have to go... Bye All!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iI have to go... Bye All!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
@ -142,9 +142,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iThanks $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iThanks $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iThanks All!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iThanks All!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
@ -160,9 +160,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iGood Game $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Game $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iGood Game All!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Game All!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
@ -178,9 +178,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iGood Luck $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iGood Luck All!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck All!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
@ -196,9 +196,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iHave Fun $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iHave Fun $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iHave Fun All!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iHave Fun All!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
@ -214,9 +214,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iGood Luck and Have Fun $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck and Have Fun $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iGood Luck and Have Fun All!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck and Have Fun All!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
@ -232,9 +232,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iNice Shot $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice Shot $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iNice Shot!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice Shot!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
@ -250,9 +250,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$command = explode(" ", $chat[1][2]); $command = explode(" ", $chat[1][2]);
if (isset($command[1])) { if (isset($command[1])) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iNice One $z$<' . $this->getTarget($command[1]) . '$>$i!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice One $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else { } else {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iNice One!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice One!';
} }
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
@ -265,7 +265,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
* @param Player $player * @param Player $player
*/ */
public function chat_lol(array $chat, Player $player) { public function chat_lol(array $chat, Player $player) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iLoL!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iLoL!';
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
} }
@ -276,7 +276,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
* @param Player $player * @param Player $player
*/ */
public function chat_lool(array $chat, Player $player) { public function chat_lool(array $chat, Player $player) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iLooOOooL!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iLooOOooL!';
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
} }
@ -287,7 +287,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
* @param Player $player * @param Player $player
*/ */
public function chat_brb(array $chat, Player $player) { public function chat_brb(array $chat, Player $player) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iBe Right Back!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBe Right Back!';
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
} }
@ -298,7 +298,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
* @param Player $player * @param Player $player
*/ */
public function chat_bgm(array $chat, Player $player) { public function chat_bgm(array $chat, Player $player) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iBad Game for me :('; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBad Game for me :(';
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
} }
@ -351,7 +351,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
* @param Player $player * @param Player $player
*/ */
public function chat_afk(array $chat, Player $player) { public function chat_afk(array $chat, Player $player) {
$msg = '$g[$<' . $player->nickname . '$>$s] $ff0$iAway From Keyboard!'; $msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iAway From Keyboard!';
$this->maniaControl->chat->sendChat($msg, null, false); $this->maniaControl->chat->sendChat($msg, null, false);
if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_AFK_FORCE_SPEC)) { if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_AFK_FORCE_SPEC)) {

View File

@ -291,7 +291,7 @@ class LocalRecordsPlugin implements CallbackListener, CommandListener, TimerList
} }
if ($oldRecord->time == $time) { if ($oldRecord->time == $time) {
// Same time // Same time
$message = '$<' . $player->nickname . '$> equalized his/her $<$ff0' . $oldRecord->rank . '.$> Local Record: $<$fff' . Formatter::formatTime($oldRecord->time) . '$>!'; $message = '$<$fff' . $player->nickname . '$> equalized his/her $<$ff0' . $oldRecord->rank . '.$> Local Record: $<$fff' . Formatter::formatTime($oldRecord->time) . '$>!';
$this->maniaControl->chat->sendInformation('$3c0' . $message); $this->maniaControl->chat->sendInformation('$3c0' . $message);
return; return;
} }
@ -334,7 +334,7 @@ class LocalRecordsPlugin implements CallbackListener, CommandListener, TimerList
} }
else { else {
$improvement = ((!$oldRecord || $newRecord->rank < $oldRecord->rank) ? 'gained the' : 'improved the'); $improvement = ((!$oldRecord || $newRecord->rank < $oldRecord->rank) ? 'gained the' : 'improved the');
$message = '$<' . $player->nickname . '$> ' . $improvement . ' $<$ff0' . $newRecord->rank . '.$> Local Record: $<$fff' . Formatter::formatTime($newRecord->time) . '$>'; $message = '$<$fff' . $player->nickname . '$> ' . $improvement . ' $<$ff0' . $newRecord->rank . '.$> Local Record: $<$fff' . Formatter::formatTime($newRecord->time) . '$>';
if ($oldRecord) $oldRank = ($improvement == 'improved the') ? '' : $oldRecord->rank . '. '; if ($oldRecord) $oldRank = ($improvement == 'improved the') ? '' : $oldRecord->rank . '. ';
if ($oldRecord) $message .= ' ($<$ff0' . $oldRank . '$>$<$fff-' . Formatter::formatTime(($oldRecord->time - $newRecord->time)) . '$>)'; if ($oldRecord) $message .= ' ($<$ff0' . $oldRank . '$>$<$fff-' . Formatter::formatTime(($oldRecord->time - $newRecord->time)) . '$>)';
$this->maniaControl->chat->sendInformation('$3c0' . $message.'!'); $this->maniaControl->chat->sendInformation('$3c0' . $message.'!');