mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 08:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Changed commands to use CommandSender::getServer()

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-06-17 18:41:10 +02:00
parent f14fecbb5f
commit 9e8f015dc0
30 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/command/defaults/BanCommand.php
View File

@ -52,9 +52,9 @@ class BanCommand extends VanillaCommand{
$name = array_shift($args);
$reason = implode(" ", $args);
Server::getInstance()->getNameBans()->addBan($name, $reason, null, $sender->getName());
$sender->getServer()->getNameBans()->addBan($name, $reason, null, $sender->getName());
if(($player = Server::getInstance()->getPlayerExact($name)) instanceof Player){
if(($player = $sender->getServer()->getPlayerExact($name)) instanceof Player){
$player->kick("Banned by admin.");
}

6
src/pocketmine/command/defaults/BanIpCommand.php
View File

@ -55,7 +55,7 @@ class BanIpCommand extends VanillaCommand{
if(preg_match("/^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$/", $value)){
$this->processIPBan($value, $sender, $reason);
}else{
if(($player = Server::getInstance()->getPlayer($value)) instanceof Player){
if(($player = $sender->getServer()->getPlayer($value)) instanceof Player){
$this->processIPBan($player->getAddress(), $sender, $reason);
}else{
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
@ -68,9 +68,9 @@ class BanIpCommand extends VanillaCommand{
}
private function processIPBan($ip, CommandSender $sender, $reason){
Server::getInstance()->getIPBans()->addBan($ip, $reason, null, $sender->getName());
$sender->getServer()->getIPBans()->addBan($ip, $reason, null, $sender->getName());
foreach(Server::getInstance()->getOnlinePlayers() as $player){
foreach($sender->getServer()->getOnlinePlayers() as $player){
if($player->getAddress() === $ip){
$player->kick("You have been IP banned.");
}

6
src/pocketmine/command/defaults/BanListCommand.php
View File

@ -39,13 +39,13 @@ class BanListCommand extends VanillaCommand{
if(!$this->testPermission($sender)){
return true;
}
$list = Server::getInstance()->getNameBans();
$list = $sender->getServer()->getNameBans();
if(isset($args[0])){
$args[0] = strtolower($args[0]);
if($args[0] === "ips"){
$list = Server::getInstance()->getIPBans();
$list = $sender->getServer()->getIPBans();
}elseif($args[0] === "players"){
$list = Server::getInstance()->getNameBans();
$list = $sender->getServer()->getNameBans();
}
}

2
src/pocketmine/command/defaults/DefaultGamemodeCommand.php
View File

@ -50,7 +50,7 @@ class DefaultGamemodeCommand extends VanillaCommand{
$gameMode = Server::getGamemodeFromString($args[0]);
if($gameMode !== -1){
Server::getInstance()->setConfigInt("gamemode", $gameMode);
$sender->getServer()->setConfigInt("gamemode", $gameMode);
$sender->sendMessage("Default game mode set to " . strtolower(Server::getGamemodeString($gameMode)));
}else{
$sender->sendMessage("Unknown game mode");

2
src/pocketmine/command/defaults/DeopCommand.php
View File

@ -51,7 +51,7 @@ class DeopCommand extends VanillaCommand{
$name = array_shift($args);
$player = Server::getInstance()->getOfflinePlayer($name);
$player = $sender->getServer()->getOfflinePlayer($name);
$player->setOp(false);
if($player instanceof Player){
$player->sendMessage(TextFormat::YELLOW . "You are no longer op!");

4
src/pocketmine/command/defaults/DifficultyCommand.php
View File

@ -49,12 +49,12 @@ class DifficultyCommand extends VanillaCommand{
$difficulty = Server::getDifficultyFromString($args[0]);
if(Server::getInstance()->isHardcore()){
if($sender->getServer()->isHardcore()){
$difficulty = 3;
}
if($difficulty !== -1){
Server::getInstance()->setConfigInt("difficulty", $difficulty);
$sender->getServer()->setConfigInt("difficulty", $difficulty);
$sender->sendMessage("Set difficulty to " . $difficulty);
}else{
$sender->sendMessage("Unknown difficulty");

5
src/pocketmine/command/defaults/GamemodeCommand.php
View File

@ -53,15 +53,12 @@ class GamemodeCommand extends VanillaCommand{
if($gameMode === -1){
$sender->sendMessage("Unknown game mode");
return true;
Server::getInstance()->setConfigInt("gamemode", $gameMode);
$sender->sendMessage("Default game mode set to " . strtolower(Server::getGamemodeString($gameMode)));
}
$target = $sender;
if(isset($args[1])){
$target = Server::getInstance()->getPlayer($args[1]);
$target = $sender->getServer()->getPlayer($args[1]);
if($target === null){
$sender->sendMessage("Can't find player " . $args[1]);

2
src/pocketmine/command/defaults/GiveCommand.php
View File

@ -50,7 +50,7 @@ class GiveCommand extends VanillaCommand{
return false;
}
$player = Server::getInstance()->getPlayer($args[0]);
$player = $sender->getServer()->getPlayer($args[0]);
$item = Item::fromString($args[1]);
if(!isset($args[2])){

4
src/pocketmine/command/defaults/HelpCommand.php
View File

@ -66,7 +66,7 @@ class HelpCommand extends VanillaCommand{
if($command === ""){
$commands = [];
foreach(Server::getInstance()->getCommandMap()->getCommands() as $command){
foreach($sender->getServer()->getCommandMap()->getCommands() as $command){
if($command->testPermissionSilent($sender)){
$commands[$command->getName()] = $command;
}
@ -87,7 +87,7 @@ class HelpCommand extends VanillaCommand{
return true;
}else{
if(($command = Server::getInstance()->getCommandMap()->getCommand(strtolower($command))) instanceof Command){
if(($command = $sender->getServer()->getCommandMap()->getCommand(strtolower($command))) instanceof Command){
if($command->testPermissionSilent($sender)){
$message = TextFormat::YELLOW . "--------- " . TextFormat::WHITE . " Help: /" . $command->getName() . TextFormat::YELLOW . " ---------\n";
$message .= TextFormat::GOLD . "Description: " . TextFormat::WHITE . $command->getDescription() . "\n";

2
src/pocketmine/command/defaults/KickCommand.php
View File

@ -56,7 +56,7 @@ class KickCommand extends VanillaCommand{
$reason = "Kicked by an operator.";
}
if(($player = Server::getInstance()->getPlayer($name)) instanceof Player){
if(($player = $sender->getServer()->getPlayer($name)) instanceof Player){
$player->kick("Kicked by admin.");
}else{
$sender->sendMessage($name . " not found.");

4
src/pocketmine/command/defaults/ListCommand.php
View File

@ -43,13 +43,13 @@ class ListCommand extends VanillaCommand{
$online = "";
foreach(Server::getInstance()->getOnlinePlayers() as $player){
foreach($sender->getServer()->getOnlinePlayers() as $player){
if($player->isOnline() and (!($sender instanceof Player) or $sender->canSee($player))){
$online .= $player->getDisplayName() . ", ";
}
}
$sender->sendMessage("There are " . count(Server::getInstance()->getOnlinePlayers()) . "/" . Server::getInstance()->getMaxPlayers() . " players online:\n" . substr($online, 0, -2));
$sender->sendMessage("There are " . count($sender->getServer()->getOnlinePlayers()) . "/" . $sender->getServer()->getMaxPlayers() . " players online:\n" . substr($online, 0, -2));
return true;
}

2
src/pocketmine/command/defaults/MeCommand.php
View File

@ -55,7 +55,7 @@ class MeCommand extends VanillaCommand{
$message .= $sender->getName();
}
Server::getInstance()->broadcastMessage($message . " " . implode(" ", $args));
$sender->getServer()->broadcastMessage($message . " " . implode(" ", $args));
return true;
}

2
src/pocketmine/command/defaults/OpCommand.php
View File

@ -51,7 +51,7 @@ class OpCommand extends VanillaCommand{
$name = array_shift($args);
$player = Server::getInstance()->getOfflinePlayer($name);
$player = $sender->getServer()->getOfflinePlayer($name);
Command::broadcastCommandMessage($sender, "Opped " . $player->getName());
if($player instanceof Player){
$player->sendMessage("You are now op!");

2
src/pocketmine/command/defaults/PardonCommand.php
View File

@ -48,7 +48,7 @@ class PardonCommand extends VanillaCommand{
return false;
}
Server::getInstance()->getNameBans()->remove($args[0]);
$sender->getServer()->getNameBans()->remove($args[0]);
Command::broadcastCommandMessage($sender, "Pardoned " . $name);

2
src/pocketmine/command/defaults/PardonIpCommand.php
View File

@ -49,7 +49,7 @@ class PardonIpCommand extends VanillaCommand{
}
if(preg_match("/^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$/", $args[0])){
Server::getInstance()->getIPBans()->remove($args[0]);
$sender->getServer()->getIPBans()->remove($args[0]);
Command::broadcastCommandMessage($sender, "Pardoned IP " . $args[0]);
}else{
$sender->sendMessage("Invalid IP");

2
src/pocketmine/command/defaults/PluginsCommand.php
View File

@ -49,7 +49,7 @@ class PluginsCommand extends VanillaCommand{
private function getPluginList(){
$list = "";
foreach(($plugins = Server::getInstance()->getPluginManager()->getPlugins()) as $plugin){
foreach(($plugins = $sender->getServer()->getPluginManager()->getPlugins()) as $plugin){
if(strlen($list) > 0){
$list .= TextFormat::WHITE . ", ";
}

2
src/pocketmine/command/defaults/ReloadCommand.php
View File

@ -44,7 +44,7 @@ class ReloadCommand extends VanillaCommand{
Command::broadcastCommandMessage($sender, TextFormat::YELLOW . "Reloading server...");
Server::getInstance()->reload();
$sender->getServer()->reload();
Command::broadcastCommandMessage($sender, TextFormat::GOLD . "Reload complete.");
return true;

4
src/pocketmine/command/defaults/SaveCommand.php
View File

@ -43,11 +43,11 @@ class SaveCommand extends VanillaCommand{
Command::broadcastCommandMessage($sender, "Forcing save...");
foreach(Server::getInstance()->getOnlinePlayers() as $player){
foreach($sender->getServer()->getOnlinePlayers() as $player){
$player->save();
}
foreach(Server::getInstance()->getLevels() as $level){
foreach($sender->getServer()->getLevels() as $level){
$level->save(true);
}

2
src/pocketmine/command/defaults/SaveOffCommand.php
View File

@ -41,7 +41,7 @@ class SaveOffCommand extends VanillaCommand{
return true;
}
foreach(Server::getInstance()->getLevels() as $level){
foreach($sender->getServer()->getLevels() as $level){
$level->setAutoSave(false);
}

2
src/pocketmine/command/defaults/SaveOnCommand.php
View File

@ -41,7 +41,7 @@ class SaveOnCommand extends VanillaCommand{
return true;
}
foreach(Server::getInstance()->getLevels() as $level){
foreach($sender->getServer()->getLevels() as $level){
$level->setAutoSave(true);
}

2
src/pocketmine/command/defaults/SayCommand.php
View File

@ -58,7 +58,7 @@ class SayCommand extends VanillaCommand{
$message .= $sender->getName();
}
$message .= TextFormat::LIGHT_PURPLE . "] " . implode(" ", $args);
Server::getInstance()->broadcastMessage($message);
$sender->getServer()->broadcastMessage($message);
return true;
}

2
src/pocketmine/command/defaults/SeedCommand.php
View File

@ -44,7 +44,7 @@ class SeedCommand extends VanillaCommand{
if($sender instanceof Player){
$seed = $sender->getLevel()->getSeed();
}else{
$seed = Server::getInstance()->getDefaultLevel()->getSeed();
$seed = $sender->getServer()->getDefaultLevel()->getSeed();
}
$sender->sendMessage("Seed: " . $seed);

2
src/pocketmine/command/defaults/SetWorldSpawnCommand.php
View File

@ -54,7 +54,7 @@ class SetWorldSpawnCommand extends VanillaCommand{
return true;
}
}elseif(count($args) === 3){
$level = Server::getInstance()->getDefaultLevel();
$level = $sender->getServer()->getDefaultLevel();
$pos = new Vector3($this->getInteger($sender, $args[0]), $this->getInteger($sender, $args[1]), $this->getInteger($sender, $args[2]));
}else{
$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);

2
src/pocketmine/command/defaults/SpawnpointCommand.php
View File

@ -55,7 +55,7 @@ class SpawnpointCommand extends VanillaCommand{
return true;
}
}else{
$target = Server::getInstance()->getPlayer($args[0]);
$target = $sender->getServer()->getPlayer($args[0]);
if($target === null){
$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);

2
src/pocketmine/command/defaults/StatusCommand.php
View File

@ -41,7 +41,7 @@ class StatusCommand extends VanillaCommand{
return true;
}
$server = Server::getInstance();
$server = $sender->getServer();
$sender->sendMessage(TextFormat::GREEN . "---- " . TextFormat::WHITE . "Server status" . TextFormat::GREEN . " ----");
$sender->sendMessage(TextFormat::GOLD . "TPS: " . TextFormat::WHITE . $server->getTicksPerSecond());
//TODO: implement network speed

4
src/pocketmine/command/defaults/StopCommand.php
View File

@ -45,12 +45,12 @@ class StopCommand extends VanillaCommand{
$reason = implode(" ", $args);
if($reason !== ""){
foreach(Server::getInstance()->getOnlinePlayers() as $player){
foreach($sender->getServer()->getOnlinePlayers() as $player){
$player->kick($reason);
}
}
Server::getInstance()->shutdown();
$sender->getServer()->shutdown();
return true;
}

4
src/pocketmine/command/defaults/TeleportCommand.php
View File

@ -63,7 +63,7 @@ class TeleportCommand extends VanillaCommand{
return true;
}
}else{
$target = Server::getInstance()->getPlayer($args[0]);
$target = $sender->getServer()->getPlayer($args[0]);
if($target === null){
$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
@ -71,7 +71,7 @@ class TeleportCommand extends VanillaCommand{
}
if(count($args) === 2){
$origin = $target;
$target = Server::getInstance()->getPlayer($args[1]);
$target = $sender->getServer()->getPlayer($args[1]);
if($target === null){
$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[1]);

2
src/pocketmine/command/defaults/TellCommand.php
View File

@ -51,7 +51,7 @@ class TellCommand extends VanillaCommand{
$name = strtolower(array_shift($args));
$player = Server::getInstance()->getPlayer($name);
$player = $sender->getServer()->getPlayer($name);
if($player instanceof Player){
$sender->sendMessage("[me -> " . $player->getName() . "] " . implode($args));

6
src/pocketmine/command/defaults/VersionCommand.php
View File

@ -45,14 +45,14 @@ class VersionCommand extends VanillaCommand{
}
if(count($args) === 0){
$output = "This server is running PocketMine-MP version " . Server::getInstance()->getPocketMineVersion() . " 「" . Server::getInstance()->getCodename() . "」 (Implementing API version " . Server::getInstance()->getApiVersion() . " for Minecraft: PE " . Server::getInstance()->getVersion() . " protocol version " . Info::CURRENT_PROTOCOL . ")";
$output = "This server is running PocketMine-MP version " . $sender->getServer()->getPocketMineVersion() . " 「" . $sender->getServer()->getCodename() . "」 (Implementing API version " . $sender->getServer()->getApiVersion() . " for Minecraft: PE " . $sender->getServer()->getVersion() . " protocol version " . Info::CURRENT_PROTOCOL . ")";
if(\pocketmine\GIT_COMMIT !== str_repeat("00", 20)){
$output .= " [git " . \pocketmine\GIT_COMMIT . "]";
}
$sender->sendMessage($output);
}else{
$pluginName = implode(" ", $args);
$exactPlugin = Server::getInstance()->getPluginManager()->getPlugin($pluginName);
$exactPlugin = $sender->getServer()->getPluginManager()->getPlugin($pluginName);
if($exactPlugin instanceof Plugin){
$this->describeToSender($exactPlugin, $sender);
@ -62,7 +62,7 @@ class VersionCommand extends VanillaCommand{
$found = false;
$pluginName = strtolower($pluginName);
foreach(Server::getInstance()->getPluginManager()->getPlugins() as $plugin){
foreach($sender->getServer()->getPluginManager()->getPlugins() as $plugin){
if(stripos($plugin->getName(), $pluginName) !== false){
$this->describeToSender($plugin, $sender);
$found = true;

12
src/pocketmine/command/defaults/WhitelistCommand.php
View File

@ -48,23 +48,23 @@ class WhitelistCommand extends VanillaCommand{
}
switch(strtolower($args[0])){
case "reload":
Server::getInstance()->reloadWhitelist();
$sender->getServer()->reloadWhitelist();
Command::broadcastCommandMessage($sender, "Reloaded white-list from file");
return true;
case "on":
Server::getInstance()->setConfigBool("white-list", true);
$sender->getServer()->setConfigBool("white-list", true);
Command::broadcastCommandMessage($sender, "Turned on white-listing");
return true;
case "off":
Server::getInstance()->setConfigBool("white-list", false);
$sender->getServer()->setConfigBool("white-list", false);
Command::broadcastCommandMessage($sender, "Turned off white-listing");
return true;
case "list":
$result = "";
foreach(Server::getInstance()->getWhitelisted() as $player){
foreach($sender->getServer()->getWhitelisted() as $player){
$result .= $player . ", ";
}
$sender->sendMessage("White-listed players: " . substr($result, 0, -2));
@ -77,12 +77,12 @@ class WhitelistCommand extends VanillaCommand{
}
switch(strtolower($args[0])){
case "add":
Server::getInstance()->getOfflinePlayer($args[1])->setWhitelisted(true);
$sender->getServer()->getOfflinePlayer($args[1])->setWhitelisted(true);
Command::broadcastCommandMessage($sender, "Added " . $args[1] . " to white-list");
return true;
case "remove":
Server::getInstance()->getOfflinePlayer($args[1])->setWhitelisted(false);
$sender->getServer()->getOfflinePlayer($args[1])->setWhitelisted(false);
Command::broadcastCommandMessage($sender, "Removed " . $args[1] . " from white-list");
return true;