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

added isMuted() function to the player object + some adds what a player cant do when muted (use chatmessages like /gg, add map to queue, start a vote...)

This commit is contained in:
kremsy 2014-08-24 12:28:16 +02:00
parent afa15217a2
commit ffa3506879
7 changed files with 307 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/codeStyleSettings.xml
View File

@ -38,7 +38,6 @@
<codeStyleSettings language="PHP">
<option name="KEEP_LINE_BREAKS" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
<option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
<option name="CLASS_BRACE_STYLE" value="1" />
@ -49,7 +48,6 @@
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
<option name="METHOD_PARAMETERS_WRAP" value="1" />
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="DOWHILE_BRACE_FORCE" value="3" />

6
application/core/Maps/MapQueue.php
View File

@ -263,6 +263,12 @@ class MapQueue implements CallbackListener, CommandListener {
return;
}
// Check if the Player is muted
if ($player->isMuted()) {
$this->maniaControl->getChat()->sendError('Muted Players are not allowed to queue a map.', $player);
return;
}
//Check if player is allowed to add (another) map
$isModerator = $this->maniaControl->getAuthenticationManager()->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR);

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

@ -317,7 +317,7 @@ class Player {
}
/**
* Sets the Player Data
* Sets the Player Data and stores it in the Database
*
* @param mixed $object
* @param string $dataName
@ -329,6 +329,21 @@ class Player {
return $this->maniaControl->getPlayerManager()->getPlayerDataManager()->setPlayerData($object, $dataName, $this, $value, $serverIndex);
}
/*
* Check if a Player is muted
*
* @return bool
*/
public function isMuted() {
$ignoreList = $this->maniaControl->getClient()->getIgnoreList(100, 0);
foreach ($ignoreList as $ignoredPlayers) {
if ($ignoredPlayers->login === $this->login) {
return true;
}
}
return false;
}
/**
* Var_Dump the Player
*/

11
application/core/Players/PlayerActions.php
View File

@ -516,16 +516,9 @@ class PlayerActions {
/**
* Check if a Player is muted
*
* @param string $login
* @return bool
* @deprecated see Player/isMuted()
*/
public function isPlayerMuted($login) {
$ignoreList = $this->maniaControl->getClient()->getIgnoreList(100, 0);
foreach ($ignoreList as $ignoredPlayers) {
if ($ignoredPlayers->login === $login) {
return true;
}
}
return false;
return $this->maniaControl->getPlayerManager()->getPlayer($login)->isMuted();
}
}

3
application/core/Players/PlayerList.php
View File

@ -515,8 +515,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$label->setTextSize($textSize);
$label->setTextColor($textColor);
if (!$this->maniaControl->getPlayerManager()->getPlayerActions()->isPlayerMuted($login)
) {
if (!$player->isMuted()) {
$label->setText('Mute');
$quad->setAction(self::ACTION_MUTE_PLAYER . '.' . $login);
} else {

526
application/plugins/MCTeam/ChatMessagePlugin.php
View File

@ -95,6 +95,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$this->maniaControl->getCommandManager()->registerCommandListener('brb', $this, 'chat_brb', false, 'Writes a be right back message to the chat.');
$this->maniaControl->getCommandManager()->registerCommandListener('bgm', $this, 'chat_bgm', false, 'Writes a bad game for me message to the chat.');
$this->maniaControl->getCommandManager()->registerCommandListener('afk', $this, 'chat_afk', false, 'Writes an away from keyboard message to the chat.');
$this->maniaControl->getCommandManager()->registerCommandListener('wp', $this, 'chat_wp', false, 'Writes an well played message to the chat.');
$this->maniaControl->getCommandManager()->registerCommandListener(array('bm', 'bootme'), $this, 'chat_bootme', false, 'Gets you away from this server quickly!');
$this->maniaControl->getCommandManager()->registerCommandListener(array('rq', 'ragequit'), $this, 'chat_ragequit', false, 'Gets you away from this server in rage!');
//TODO block command listener for muted people
@ -109,6 +110,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
public function unload() {
}
/**
* Builds a chat message starting with the player's nickname, can used to express emotions
*
@ -119,7 +121,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$message = substr($chat[1][2], 4);
$msg = '$<' . $player->nickname . '$>$s$i$fa0 ' . $message;
$this->maniaControl->getChat()->sendChat($msg, null, false);
$this->sendChat($msg, $player);
}
/**
@ -136,7 +138,276 @@ class ChatMessagePlugin implements CommandListener, Plugin {
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iHello All!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
$this->sendChat($msg, $player);
}
/**
* Bye Message
*
* @param array $chat
* @param Player $player
*/
public function chat_bye(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBye $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iI have to go... Bye All!';
}
$this->sendChat($msg, $player);
}
/**
* Thx Message
*
* @param array $chat
* @param Player $player
*/
public function chat_thx(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iThanks $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iThanks All!';
}
$this->sendChat($msg, $player);
}
/**
* Good Game Message
*
* @param array $chat
* @param Player $player
*/
public function chat_gg(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[' . $player->getEscapedNickname() . '] $ff0$iGood Game $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[' . $player->getEscapedNickname() . '] $ff0$iGood Game All!';
}
$this->sendChat($msg, $player);
}
/**
* Good Luck Message
*
* @param array $chat
* @param Player $player
*/
public function chat_gl(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck All!';
}
$this->sendChat($msg, $player);
}
/**
* Have Fun Message
*
* @param array $chat
* @param Player $player
*/
public function chat_hf(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[' . $player->getEscapedNickname() . '] $ff0$iHave Fun $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[' . $player->getEscapedNickname() . '] $ff0$iHave Fun All!';
}
$this->sendChat($msg, $player);
}
/**
* Good Luck and Have Fun Message
*
* @param array $chat
* @param Player $player
*/
public function chat_glhf(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck and Have Fun $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck and Have Fun All!';
}
$this->sendChat($msg, $player);
}
/**
* Nice Shot Message
*
* @param array $chat
* @param Player $player
*/
public function chat_ns(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice Shot $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice Shot!';
}
$this->sendChat($msg, $player);
}
/**
* Nice one Message
*
* @param array $chat
* @param Player $player
*/
public function chat_n1(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice One $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice One!';
}
$this->sendChat($msg, $player);
}
/**
* Well Played message
*
* @param array $chat
* @param Player $player
*/
public function chat_wp(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iWell Played $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iWell Played!';
}
$this->sendChat($msg, $player);
}
/**
* Lol! Message
*
* @param array $chat
* @param Player $player
*/
public function chat_lol(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iLoL!';
$this->sendChat($msg, $player);
}
/**
* LooOOooL! Message
*
* @param array $chat
* @param Player $player
*/
public function chat_lool(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iLooOOooL!';
$this->sendChat($msg, $player);
}
/**
* Be right back Message
*
* @param array $chat
* @param Player $player
*/
public function chat_brb(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBe Right Back!';
$this->sendChat($msg, $player);
}
/**
* Bad game for me Message
*
* @param array $chat
* @param Player $player
*/
public function chat_bgm(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBad Game for me :(';
$this->sendChat($msg, $player);
}
/**
* Leave the server with an Bootme Message
*
* @param array $chat
* @param Player $player
*/
public function chat_bootme(array $chat, Player $player) {
$msg = '$i$ff0 $<' . $player->nickname . '$>$s$39f chooses to boot back to the real world!';
$this->sendChat($msg, $player, true);
$message = '$39F Thanks for Playing, see you around!$z';
try {
$this->maniaControl->getClient()->kick($player->login, $message);
} catch (UnknownPlayerException $exception) {
$this->maniaControl->getChat()->sendException($exception, $player);
}
}
/**
* Leave the server with an Ragequit
*
* @param array $chat
* @param Player $player
*/
public function chat_ragequit(array $chat, Player $player) {
try {
$message = '$39F Thanks for Playing, please come back soon!$z ';
$this->maniaControl->getClient()->kick($player->login, $message);
$msg = '$i$ff0 $<' . $player->nickname . '$>$s$f00 said: "@"#!" and ragequitted!';
$this->sendChat($msg, $player, true);
} catch (UnknownPlayerException $e) {
$this->maniaControl->getChat()->sendError('Error occurred: ' . $e->getMessage(), $player);
}
}
/**
* Afk Message and force player to spec
*
* @param array $chat
* @param Player $player
*/
public function chat_afk(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iAway From Keyboard!';
$this->sendChat($msg, $player);
if (!$this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_AFK_FORCE_SPEC)) {
return;
}
if ($player->isSpectator) {
return;
}
try {
// Force into spec
$this->maniaControl->getClient()->forceSpectator($player->login, 3);
// Free player slot
$this->maniaControl->getClient()->spectatorReleasePlayerSlot($player->login);
} catch (UnknownPlayerException $exception) {
$this->maniaControl->getChat()->sendException($exception, $player);
} catch (PlayerStateException $exception) {
}
}
/**
@ -163,254 +434,17 @@ class ChatMessagePlugin implements CommandListener, Plugin {
}
/**
* Bye Message
* Checks if the Player is Muted and sends the Chat if he isnt
*
* @param array $chat
* @param $msg
* @param Player $player
* @param bool $prefix
*/
public function chat_bye(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBye $z$<' . $this->getTarget($command[1]) . '$>$i!';
private function sendChat($msg, Player $player, $prefix = false) {
if (!$player->isMuted()) {
$this->maniaControl->getChat()->sendChat($msg, null, $prefix);
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iI have to go... Bye All!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Thx Message
*
* @param array $chat
* @param Player $player
*/
public function chat_thx(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iThanks $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iThanks All!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Good Game Message
*
* @param array $chat
* @param Player $player
*/
public function chat_gg(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[' . $player->getEscapedNickname() . '] $ff0$iGood Game $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[' . $player->getEscapedNickname() . '] $ff0$iGood Game All!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Good Luck Message
*
* @param array $chat
* @param Player $player
*/
public function chat_gl(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck All!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Have Fun Message
*
* @param array $chat
* @param Player $player
*/
public function chat_hf(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[' . $player->getEscapedNickname() . '] $ff0$iHave Fun $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[' . $player->getEscapedNickname() . '] $ff0$iHave Fun All!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Good Luck and Have Fun Message
*
* @param array $chat
* @param Player $player
*/
public function chat_glhf(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck and Have Fun $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iGood Luck and Have Fun All!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Nice Shot Message
*
* @param array $chat
* @param Player $player
*/
public function chat_ns(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice Shot $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice Shot!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Nice one Message
*
* @param array $chat
* @param Player $player
*/
public function chat_n1(array $chat, Player $player) {
$command = explode(" ", $chat[1][2]);
if (isset($command[1])) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice One $z$<' . $this->getTarget($command[1]) . '$>$i!';
} else {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iNice One!';
}
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Lol! Message
*
* @param array $chat
* @param Player $player
*/
public function chat_lol(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iLoL!';
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* LooOOooL! Message
*
* @param array $chat
* @param Player $player
*/
public function chat_lool(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iLooOOooL!';
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Be right back Message
*
* @param array $chat
* @param Player $player
*/
public function chat_brb(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBe Right Back!';
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Bad game for me Message
*
* @param array $chat
* @param Player $player
*/
public function chat_bgm(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iBad Game for me :(';
$this->maniaControl->getChat()->sendChat($msg, null, false);
}
/**
* Leave the server with an Bootme Message
*
* @param array $chat
* @param Player $player
*/
public function chat_bootme(array $chat, Player $player) {
$msg = '$i$ff0 $<' . $player->nickname . '$>$s$39f chooses to boot back to the real world!';
$this->maniaControl->getChat()->sendChat($msg, null, true);
$message = '$39F Thanks for Playing, see you around!$z';
try {
$this->maniaControl->getClient()->kick($player->login, $message);
} catch (UnknownPlayerException $exception) {
$this->maniaControl->getChat()->sendException($exception, $player);
}
}
/**
* Leave the server with an Ragequit
*
* @param array $chat
* @param Player $player
*/
public function chat_ragequit(array $chat, Player $player) {
try {
$message = '$39F Thanks for Playing, please come back soon!$z ';
$this->maniaControl->getClient()->kick($player->login, $message);
$msg = '$i$ff0 $<' . $player->nickname . '$>$s$f00 said: "@"#!" and ragequitted!';
$this->maniaControl->getChat()->sendChat($msg, null, true);
} catch (UnknownPlayerException $e) {
$this->maniaControl->getChat()->sendError('Error occurred: ' . $e->getMessage(), $player);
}
}
/**
* Afk Message and force player to spec
*
* @param array $chat
* @param Player $player
*/
public function chat_afk(array $chat, Player $player) {
$msg = '$ff0[$<' . $player->nickname . '$>] $ff0$iAway From Keyboard!';
$this->maniaControl->getChat()->sendChat($msg, null, false);
if (!$this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_AFK_FORCE_SPEC)
) {
return;
}
if ($player->isSpectator) {
return;
}
try {
// Force into spec
$this->maniaControl->getClient()->forceSpectator($player->login, 3);
// Free player slot
$this->maniaControl->getClient()->spectatorReleasePlayerSlot($player->login);
} catch (UnknownPlayerException $exception) {
$this->maniaControl->getChat()->sendException($exception, $player);
} catch (PlayerStateException $exception) {
$this->maniaControl->getChat()->sendError("You can't use this command because you are muted!", $player);
}
}
}

5
application/plugins/MCTeam/CustomVotesPlugin.php
View File

@ -443,9 +443,8 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
* @param callable $function calls the given function only if the vote is successful and returns as Parameter the Voting-Results
*/
public function startVote(Player $player, $voteIndex, $function = null) {
//Player is muted
if ($this->maniaControl->getPlayerManager()->getPlayerActions()->isPlayerMuted($player)
) {
// Check if the Player is muted
if ($player->isMuted()) {
$this->maniaControl->getChat()->sendError('Muted Players are not allowed to start a vote.', $player);
return;
}