From 8c4afcd21a022247864daf5bb3c6b17028f785ae Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 2 Apr 2014 18:40:24 +0200 Subject: [PATCH] Added /spawnpoint --- src/pocketmine/command/SimpleCommandMap.php | 2 + .../command/defaults/SpawnpointCommand.php | 85 +++++++++++++++++++ .../command/defaults/VanillaCommand.php | 4 +- 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 src/pocketmine/command/defaults/SpawnpointCommand.php diff --git a/src/pocketmine/command/SimpleCommandMap.php b/src/pocketmine/command/SimpleCommandMap.php index 0367832dd..eedb966a1 100644 --- a/src/pocketmine/command/SimpleCommandMap.php +++ b/src/pocketmine/command/SimpleCommandMap.php @@ -43,6 +43,7 @@ use pocketmine\command\defaults\SaveOffCommand; use pocketmine\command\defaults\SaveOnCommand; use pocketmine\command\defaults\SayCommand; use pocketmine\command\defaults\SeedCommand; +use pocketmine\command\defaults\SpawnpointCommand; use pocketmine\command\defaults\StopCommand; use pocketmine\command\defaults\TellCommand; use pocketmine\command\defaults\VanillaCommand; @@ -92,6 +93,7 @@ class SimpleCommandMap implements CommandMap{ $this->register("pocketmine", new GiveCommand("give")); $this->register("pocketmine", new GamemodeCommand("gamemode")); $this->register("pocketmine", new KillCommand("kill")); + $this->register("pocketmine", new SpawnpointCommand("spawnpoint")); } diff --git a/src/pocketmine/command/defaults/SpawnpointCommand.php b/src/pocketmine/command/defaults/SpawnpointCommand.php new file mode 100644 index 000000000..c29f0e0ef --- /dev/null +++ b/src/pocketmine/command/defaults/SpawnpointCommand.php @@ -0,0 +1,85 @@ + OR /spawnpoint " + ); + $this->setPermission("pocketmine.command.spawnpoint"); + } + + public function execute(CommandSender $sender, $currentAlias, array $args){ + if(!$this->testPermission($sender)){ + return true; + } + + $target = null; + + if(count($args) === 0){ + if($sender instanceof Player){ + $target = $sender; + }else{ + $sender->sendMessage(TextFormat::RED . "Please provide a player!"); + return true; + } + }else{ + $target = Server::getInstance()->getPlayer($args[0]); + if($target === null){ + $sender->sendMessage(TextFormat::RED . "Can't find player ".$args[0]); + return true; + } + } + + $level = $target->getLevel(); + + if(count($args) === 4){ + if($level !== null){ + $x = (int) $this->getRelativeDouble($sender->x, $sender, $args[1]); + $y = (int) $this->getRelativeDouble($sender->y, $sender, $args[2]); + $z = (int) $this->getRelativeDouble($sender->z, $sender, $args[3], 0, 128); + $target->setSpawn(new Position($x, $y, $z, $level)); + Command::broadcastCommandMessage($sender, "Set ".$target->getName()."'s spawnpoint to ".$x.", ".$y.", ".$z); + return true; + } + }elseif(count($args) <= 1){ + $pos = new Position((int) $sender->x, (int) $sender->y, (int) $sender->z, $sender->getLevel()); + $target->setSpawn($pos); + Command::broadcastCommandMessage($sender, "Set ".$target->getName()."'s spawnpoint to ".$pos->x.", ".$pos->y.", ".$pos->z); + return true; + } + + $sender->sendMessage(TextFormat::RED . "Usage: ".$this->usageMessage); + return true; + } +} \ No newline at end of file diff --git a/src/pocketmine/command/defaults/VanillaCommand.php b/src/pocketmine/command/defaults/VanillaCommand.php index 2c5546872..605421584 100644 --- a/src/pocketmine/command/defaults/VanillaCommand.php +++ b/src/pocketmine/command/defaults/VanillaCommand.php @@ -45,14 +45,14 @@ abstract class VanillaCommand extends Command{ return $i; } - protected function getRelativeDouble($original, CommandSender $sender, $input){ + protected function getRelativeDouble($original, CommandSender $sender, $input, $min = self::MIN_COORD, $max = self::MAX_COORD){ if($input{0} === "~"){ $value = $this->getDouble($sender, substr($input, 1)); return $original + $value; } - return $this->getDouble($input); + return $this->getDouble($sender, $input, $min, $max); } protected function getDouble(CommandSender $sender, $value, $min = self::MIN_COORD, $max = self::MAX_COORD){