From f9a7385b47789c57d324a7e824bf69247c213ec1 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Mon, 31 Mar 2014 06:51:34 +0200 Subject: [PATCH] Added /me and /say, fixed a bunch of things, chat working --- src/PocketMine/Player.php | 12 +++- src/PocketMine/command/SimpleCommandMap.php | 5 +- src/PocketMine/command/defaults/MeCommand.php | 61 ++++++++++++++++++ .../command/defaults/SayCommand.php | 64 +++++++++++++++++++ .../event/player/PlayerChatEvent.php | 3 +- src/PocketMine/level/Level.php | 8 ++- 6 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 src/PocketMine/command/defaults/MeCommand.php create mode 100644 src/PocketMine/command/defaults/SayCommand.php diff --git a/src/PocketMine/Player.php b/src/PocketMine/Player.php index 3a03ebe676..0790c846bb 100644 --- a/src/PocketMine/Player.php +++ b/src/PocketMine/Player.php @@ -275,7 +275,6 @@ class Player extends RealHuman implements CommandSender{ $this->buffer->data = array(); $this->tasks[] = $this->server->getScheduler()->scheduleRepeatingTask(new CallbackTask(array($this, "handlePacketQueues")), 1); $this->tasks[] = $this->server->getScheduler()->scheduleRepeatingTask(new CallbackTask(array($this, "clearQueue")), 20 * 60); - console("[DEBUG] New Session started with " . $ip . ":" . $port . ". MTU " . $this->MTU . ", Client ID " . $this->clientID, true, true, 2); } @@ -1030,6 +1029,7 @@ class Player extends RealHuman implements CommandSender{ break; } $this->username = $packet->username; + $this->displayName = $this->username; $this->iusername = strtolower($this->username); $this->loginData = array("clientId" => $packet->clientId, "loginData" => $packet->loginData); @@ -1075,6 +1075,8 @@ class Player extends RealHuman implements CommandSender{ return; } + $this->server->getPluginManager()->subscribeToPermission(Player::BROADCAST_CHANNEL_ADMINISTRATIVE, $this); + $this->server->getPluginManager()->subscribeToPermission(Player::BROADCAST_CHANNEL_USERS, $this); $this->loggedIn = true; $u = Player::get($this->iusername, false, true); @@ -2072,6 +2074,8 @@ class Player extends RealHuman implements CommandSender{ if(isset($ev) and $this->username != "" and $this->spawned !== false and $ev->getQuitMessage() != ""){ Player::broadcastMessage($ev->getQuitMessage()); } + $this->server->getPluginManager()->unsubscribeFromPermission(Player::BROADCAST_CHANNEL_ADMINISTRATIVE, $this); + $this->server->getPluginManager()->unsubscribeFromPermission(Player::BROADCAST_CHANNEL_USERS, $this); $this->spawned = false; console("[INFO] " . TextFormat::AQUA . $this->username . TextFormat::RESET . "[/" . $this->ip . ":" . $this->port . "] logged out due to " . $reason); $this->windows = array(); @@ -2145,7 +2149,7 @@ class Player extends RealHuman implements CommandSender{ * @param string $message */ public static function broadcastMessage($message){ - self::groupChat($message, self::getAll()); + self::groupChat($message, Server::getInstance()->getPluginManager()->getPermissionSubscriptions(Player::BROADCAST_CHANNEL_USERS)); } /** @@ -2319,7 +2323,9 @@ class Player extends RealHuman implements CommandSender{ */ public static function groupChat($message, array $players){ foreach($players as $p){ - $p->sendMessage($message); + if($p instanceof CommandSender){ + $p->sendMessage($message); + } } } diff --git a/src/PocketMine/command/SimpleCommandMap.php b/src/PocketMine/command/SimpleCommandMap.php index 26319f3d4e..d222c4f8d9 100644 --- a/src/PocketMine/command/SimpleCommandMap.php +++ b/src/PocketMine/command/SimpleCommandMap.php @@ -26,9 +26,11 @@ use PocketMine\Command\Defaults\BanIpCommand; use PocketMine\Command\Defaults\BanListCommand; use PocketMine\Command\Defaults\DefaultGamemodeCommand; use PocketMine\Command\Defaults\HelpCommand; +use PocketMine\Command\Defaults\MeCommand; use PocketMine\Command\Defaults\PardonCommand; use PocketMine\Command\Defaults\PardonIpCommand; use PocketMine\Command\Defaults\PluginsCommand; +use PocketMine\Command\Defaults\SayCommand; use PocketMine\Command\Defaults\SeedCommand; use PocketMine\Command\Defaults\StopCommand; use PocketMine\Command\Defaults\TellCommand; @@ -52,7 +54,6 @@ class SimpleCommandMap implements CommandMap{ } private function setDefaultCommands(){ - //TODO $this->register("pocketmine", new VersionCommand("version")); $this->register("pocketmine", new PluginsCommand("plugins")); $this->register("pocketmine", new SeedCommand("seed")); @@ -65,6 +66,8 @@ class SimpleCommandMap implements CommandMap{ $this->register("pocketmine", new BanListCommand("banlist")); $this->register("pocketmine", new PardonCommand("pardon")); $this->register("pocketmine", new PardonIpCommand("pardon-ip")); + $this->register("pocketmine", new SayCommand("say")); + $this->register("pocketmine", new MeCommand("me")); } diff --git a/src/PocketMine/command/defaults/MeCommand.php b/src/PocketMine/command/defaults/MeCommand.php new file mode 100644 index 0000000000..60a7174094 --- /dev/null +++ b/src/PocketMine/command/defaults/MeCommand.php @@ -0,0 +1,61 @@ +" + ); + $this->setPermission("pocketmine.command.me"); + } + + public function execute(CommandSender $sender, $currentAlias, array $args){ + if(!$this->testPermission($sender)){ + return true; + } + + if(count($args) === 0){ + $sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage); + + return false; + } + + $message = "* "; + if($sender instanceof Player){ + $message .= $sender->getDisplayName(); + }else{ + $message .= $sender->getName(); + } + + Player::broadcastMessage($message . " " . implode(" ", $args)); + + return true; + } +} \ No newline at end of file diff --git a/src/PocketMine/command/defaults/SayCommand.php b/src/PocketMine/command/defaults/SayCommand.php new file mode 100644 index 0000000000..1dad6b21c2 --- /dev/null +++ b/src/PocketMine/command/defaults/SayCommand.php @@ -0,0 +1,64 @@ +" + ); + $this->setPermission("pocketmine.command.seed"); + } + + public function execute(CommandSender $sender, $currentAlias, array $args){ + if(!$this->testPermission($sender)){ + return true; + } + + if(count($args) === 0){ + $sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage); + + return false; + } + + $message = TextFormat::LIGHT_PURPLE . "["; + if($sender instanceof ConsoleCommandSender){ + $message .= "Server"; + }elseif($sender instanceof Player){ + $message .= $sender->getDisplayName(); + }else{ + $message .= $sender->getName(); + } + $message .= TextFormat::LIGHT_PURPLE . "] " . implode(" ", $args); + Player::broadcastMessage($message); + + return true; + } +} \ No newline at end of file diff --git a/src/PocketMine/event/player/PlayerChatEvent.php b/src/PocketMine/event/player/PlayerChatEvent.php index 8b4fdf64c9..bdbb92c538 100644 --- a/src/PocketMine/event/player/PlayerChatEvent.php +++ b/src/PocketMine/event/player/PlayerChatEvent.php @@ -23,6 +23,7 @@ namespace PocketMine\Event\Player; use PocketMine\Event\Cancellable; use PocketMine\Player; +use PocketMine\Server; /** * Called when a player chats something @@ -46,7 +47,7 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{ $this->message = $message; $this->format = $format; if($recipients === null){ - $this->recipients = Player::getAll(); + $this->recipients = Server::getInstance()->getPluginManager()->getPermissionSubscriptions(Player::BROADCAST_CHANNEL_USERS); }else{ $this->recipients = $recipients; } diff --git a/src/PocketMine/level/Level.php b/src/PocketMine/level/Level.php index 642129e199..5d672148e9 100644 --- a/src/PocketMine/level/Level.php +++ b/src/PocketMine/level/Level.php @@ -77,6 +77,8 @@ class Level{ /** @var Level */ public static $default = null; + public static $saveEnabled = true; + /** * @var Player[] */ @@ -533,7 +535,7 @@ class Level{ unset($this->usedChunks[$i]); LevelFormat::getXZ($i, $X, $Z); if(!$this->isSpawnChunk($X, $Z)){ - $this->level->unloadChunk($X, $Z, $this->server->saveEnabled); + $this->level->unloadChunk($X, $Z, self::$saveEnabled); } } } @@ -570,7 +572,7 @@ class Level{ return false; } //TODO: save enabled/disabled - /*if($this->server->saveEnabled === false and $force === false){ + /*if(self::$saveEnabled === false and $force === false){ return; }*/ @@ -1070,7 +1072,7 @@ class Level{ unset($this->chunkTiles[$index]); Cache::remove("world:{$this->name}:$X:$Z"); - return $this->level->unloadChunk($X, $Z, $this->server->saveEnabled); + return $this->level->unloadChunk($X, $Z, self::$saveEnabled); } /**