From 9e8f015dc0bbf473f4aaa178e66d2cc4a898c4ab Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Tue, 17 Jun 2014 18:41:10 +0200
Subject: [PATCH] Changed commands to use CommandSender::getServer()

---
 src/pocketmine/command/defaults/BanCommand.php       |  4 ++--
 src/pocketmine/command/defaults/BanIpCommand.php     |  6 +++---
 src/pocketmine/command/defaults/BanListCommand.php   |  6 +++---
 .../command/defaults/DefaultGamemodeCommand.php      |  2 +-
 src/pocketmine/command/defaults/DeopCommand.php      |  2 +-
 .../command/defaults/DifficultyCommand.php           |  4 ++--
 src/pocketmine/command/defaults/GamemodeCommand.php  |  5 +----
 src/pocketmine/command/defaults/GiveCommand.php      |  2 +-
 src/pocketmine/command/defaults/HelpCommand.php      |  4 ++--
 src/pocketmine/command/defaults/KickCommand.php      |  2 +-
 src/pocketmine/command/defaults/ListCommand.php      |  4 ++--
 src/pocketmine/command/defaults/MeCommand.php        |  2 +-
 src/pocketmine/command/defaults/OpCommand.php        |  2 +-
 src/pocketmine/command/defaults/PardonCommand.php    |  2 +-
 src/pocketmine/command/defaults/PardonIpCommand.php  |  2 +-
 src/pocketmine/command/defaults/PluginsCommand.php   |  2 +-
 src/pocketmine/command/defaults/ReloadCommand.php    |  2 +-
 src/pocketmine/command/defaults/SaveCommand.php      |  4 ++--
 src/pocketmine/command/defaults/SaveOffCommand.php   |  2 +-
 src/pocketmine/command/defaults/SaveOnCommand.php    |  2 +-
 src/pocketmine/command/defaults/SayCommand.php       |  2 +-
 src/pocketmine/command/defaults/SeedCommand.php      |  2 +-
 .../command/defaults/SetWorldSpawnCommand.php        |  2 +-
 .../command/defaults/SpawnpointCommand.php           |  2 +-
 src/pocketmine/command/defaults/StatusCommand.php    |  2 +-
 src/pocketmine/command/defaults/StopCommand.php      |  4 ++--
 src/pocketmine/command/defaults/TeleportCommand.php  |  4 ++--
 src/pocketmine/command/defaults/TellCommand.php      |  2 +-
 src/pocketmine/command/defaults/VersionCommand.php   |  6 +++---
 src/pocketmine/command/defaults/WhitelistCommand.php | 12 ++++++------
 30 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/src/pocketmine/command/defaults/BanCommand.php b/src/pocketmine/command/defaults/BanCommand.php
index 9967eb9e1..c3438550a 100644
--- a/src/pocketmine/command/defaults/BanCommand.php
+++ b/src/pocketmine/command/defaults/BanCommand.php
@@ -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.");
 		}
 
diff --git a/src/pocketmine/command/defaults/BanIpCommand.php b/src/pocketmine/command/defaults/BanIpCommand.php
index 161750698..b1ddcee91 100644
--- a/src/pocketmine/command/defaults/BanIpCommand.php
+++ b/src/pocketmine/command/defaults/BanIpCommand.php
@@ -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.");
 			}
diff --git a/src/pocketmine/command/defaults/BanListCommand.php b/src/pocketmine/command/defaults/BanListCommand.php
index 3a7472b8a..1e6f820d7 100644
--- a/src/pocketmine/command/defaults/BanListCommand.php
+++ b/src/pocketmine/command/defaults/BanListCommand.php
@@ -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();
 			}
 		}
 
diff --git a/src/pocketmine/command/defaults/DefaultGamemodeCommand.php b/src/pocketmine/command/defaults/DefaultGamemodeCommand.php
index 7c20da1cf..9f8bbf4e0 100644
--- a/src/pocketmine/command/defaults/DefaultGamemodeCommand.php
+++ b/src/pocketmine/command/defaults/DefaultGamemodeCommand.php
@@ -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");
diff --git a/src/pocketmine/command/defaults/DeopCommand.php b/src/pocketmine/command/defaults/DeopCommand.php
index 50f812010..c8d1fb0b7 100644
--- a/src/pocketmine/command/defaults/DeopCommand.php
+++ b/src/pocketmine/command/defaults/DeopCommand.php
@@ -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!");
diff --git a/src/pocketmine/command/defaults/DifficultyCommand.php b/src/pocketmine/command/defaults/DifficultyCommand.php
index c907f1a18..29e770bad 100644
--- a/src/pocketmine/command/defaults/DifficultyCommand.php
+++ b/src/pocketmine/command/defaults/DifficultyCommand.php
@@ -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");
diff --git a/src/pocketmine/command/defaults/GamemodeCommand.php b/src/pocketmine/command/defaults/GamemodeCommand.php
index a9423fc41..612ee02ac 100644
--- a/src/pocketmine/command/defaults/GamemodeCommand.php
+++ b/src/pocketmine/command/defaults/GamemodeCommand.php
@@ -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]);
 
diff --git a/src/pocketmine/command/defaults/GiveCommand.php b/src/pocketmine/command/defaults/GiveCommand.php
index 9cc6b53e8..93e9a37d5 100644
--- a/src/pocketmine/command/defaults/GiveCommand.php
+++ b/src/pocketmine/command/defaults/GiveCommand.php
@@ -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])){
diff --git a/src/pocketmine/command/defaults/HelpCommand.php b/src/pocketmine/command/defaults/HelpCommand.php
index 51966aa45..2958095c4 100644
--- a/src/pocketmine/command/defaults/HelpCommand.php
+++ b/src/pocketmine/command/defaults/HelpCommand.php
@@ -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";
diff --git a/src/pocketmine/command/defaults/KickCommand.php b/src/pocketmine/command/defaults/KickCommand.php
index ce507fd29..ed728b97c 100644
--- a/src/pocketmine/command/defaults/KickCommand.php
+++ b/src/pocketmine/command/defaults/KickCommand.php
@@ -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.");
diff --git a/src/pocketmine/command/defaults/ListCommand.php b/src/pocketmine/command/defaults/ListCommand.php
index 9cb7e0ff2..f941fc092 100644
--- a/src/pocketmine/command/defaults/ListCommand.php
+++ b/src/pocketmine/command/defaults/ListCommand.php
@@ -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;
 	}
diff --git a/src/pocketmine/command/defaults/MeCommand.php b/src/pocketmine/command/defaults/MeCommand.php
index 232511c42..68534e5cd 100644
--- a/src/pocketmine/command/defaults/MeCommand.php
+++ b/src/pocketmine/command/defaults/MeCommand.php
@@ -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;
 	}
diff --git a/src/pocketmine/command/defaults/OpCommand.php b/src/pocketmine/command/defaults/OpCommand.php
index 8898037e5..047fa6487 100644
--- a/src/pocketmine/command/defaults/OpCommand.php
+++ b/src/pocketmine/command/defaults/OpCommand.php
@@ -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!");
diff --git a/src/pocketmine/command/defaults/PardonCommand.php b/src/pocketmine/command/defaults/PardonCommand.php
index 914290c55..dd6e031b2 100644
--- a/src/pocketmine/command/defaults/PardonCommand.php
+++ b/src/pocketmine/command/defaults/PardonCommand.php
@@ -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);
 
diff --git a/src/pocketmine/command/defaults/PardonIpCommand.php b/src/pocketmine/command/defaults/PardonIpCommand.php
index 44f693a57..520d37023 100644
--- a/src/pocketmine/command/defaults/PardonIpCommand.php
+++ b/src/pocketmine/command/defaults/PardonIpCommand.php
@@ -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");
diff --git a/src/pocketmine/command/defaults/PluginsCommand.php b/src/pocketmine/command/defaults/PluginsCommand.php
index df6bdfe9a..d13baa8ee 100644
--- a/src/pocketmine/command/defaults/PluginsCommand.php
+++ b/src/pocketmine/command/defaults/PluginsCommand.php
@@ -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 . ", ";
 			}
diff --git a/src/pocketmine/command/defaults/ReloadCommand.php b/src/pocketmine/command/defaults/ReloadCommand.php
index c87c85ed2..76897c0af 100644
--- a/src/pocketmine/command/defaults/ReloadCommand.php
+++ b/src/pocketmine/command/defaults/ReloadCommand.php
@@ -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;
diff --git a/src/pocketmine/command/defaults/SaveCommand.php b/src/pocketmine/command/defaults/SaveCommand.php
index aa77cab93..a2adc0892 100644
--- a/src/pocketmine/command/defaults/SaveCommand.php
+++ b/src/pocketmine/command/defaults/SaveCommand.php
@@ -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);
 		}
 
diff --git a/src/pocketmine/command/defaults/SaveOffCommand.php b/src/pocketmine/command/defaults/SaveOffCommand.php
index 01ad893d5..81074c156 100644
--- a/src/pocketmine/command/defaults/SaveOffCommand.php
+++ b/src/pocketmine/command/defaults/SaveOffCommand.php
@@ -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);
 		}
 
diff --git a/src/pocketmine/command/defaults/SaveOnCommand.php b/src/pocketmine/command/defaults/SaveOnCommand.php
index 7a266516e..6f6e4e734 100644
--- a/src/pocketmine/command/defaults/SaveOnCommand.php
+++ b/src/pocketmine/command/defaults/SaveOnCommand.php
@@ -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);
 		}
 
diff --git a/src/pocketmine/command/defaults/SayCommand.php b/src/pocketmine/command/defaults/SayCommand.php
index d71ea6491..56632e1da 100644
--- a/src/pocketmine/command/defaults/SayCommand.php
+++ b/src/pocketmine/command/defaults/SayCommand.php
@@ -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;
 	}
diff --git a/src/pocketmine/command/defaults/SeedCommand.php b/src/pocketmine/command/defaults/SeedCommand.php
index a9cee952f..e3d6c8b17 100644
--- a/src/pocketmine/command/defaults/SeedCommand.php
+++ b/src/pocketmine/command/defaults/SeedCommand.php
@@ -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);
 
diff --git a/src/pocketmine/command/defaults/SetWorldSpawnCommand.php b/src/pocketmine/command/defaults/SetWorldSpawnCommand.php
index 10a4b4428..54b1cbb1f 100644
--- a/src/pocketmine/command/defaults/SetWorldSpawnCommand.php
+++ b/src/pocketmine/command/defaults/SetWorldSpawnCommand.php
@@ -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);
diff --git a/src/pocketmine/command/defaults/SpawnpointCommand.php b/src/pocketmine/command/defaults/SpawnpointCommand.php
index 08e45729e..3248155f1 100644
--- a/src/pocketmine/command/defaults/SpawnpointCommand.php
+++ b/src/pocketmine/command/defaults/SpawnpointCommand.php
@@ -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]);
 
diff --git a/src/pocketmine/command/defaults/StatusCommand.php b/src/pocketmine/command/defaults/StatusCommand.php
index 7bd1aa9e9..644d86db9 100644
--- a/src/pocketmine/command/defaults/StatusCommand.php
+++ b/src/pocketmine/command/defaults/StatusCommand.php
@@ -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
diff --git a/src/pocketmine/command/defaults/StopCommand.php b/src/pocketmine/command/defaults/StopCommand.php
index c405ff2f3..e5a4ae67f 100644
--- a/src/pocketmine/command/defaults/StopCommand.php
+++ b/src/pocketmine/command/defaults/StopCommand.php
@@ -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;
 	}
diff --git a/src/pocketmine/command/defaults/TeleportCommand.php b/src/pocketmine/command/defaults/TeleportCommand.php
index ca60ec49f..3dcb0ca24 100644
--- a/src/pocketmine/command/defaults/TeleportCommand.php
+++ b/src/pocketmine/command/defaults/TeleportCommand.php
@@ -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]);
 
diff --git a/src/pocketmine/command/defaults/TellCommand.php b/src/pocketmine/command/defaults/TellCommand.php
index 362b5e64d..0f6521586 100644
--- a/src/pocketmine/command/defaults/TellCommand.php
+++ b/src/pocketmine/command/defaults/TellCommand.php
@@ -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));
diff --git a/src/pocketmine/command/defaults/VersionCommand.php b/src/pocketmine/command/defaults/VersionCommand.php
index d92e36b83..44472f494 100644
--- a/src/pocketmine/command/defaults/VersionCommand.php
+++ b/src/pocketmine/command/defaults/VersionCommand.php
@@ -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;
diff --git a/src/pocketmine/command/defaults/WhitelistCommand.php b/src/pocketmine/command/defaults/WhitelistCommand.php
index 52270e73d..00548ebdf 100644
--- a/src/pocketmine/command/defaults/WhitelistCommand.php
+++ b/src/pocketmine/command/defaults/WhitelistCommand.php
@@ -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;