mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-18 19:55:33 +00:00
Code Issues Projects Releases Wiki Activity

commands: remove some nonsensical isValid() checks

Browse Source 
a player who doesn't have a valid world has no business sending commands anyway.
This commit is contained in:
Dylan K. Taylor 2019-08-06 15:42:01 +01:00
parent dec6f73f2f
commit 9598af7683
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/command/defaults/SpawnpointCommand.php
View File

@ -70,18 +70,16 @@ class SpawnpointCommand extends VanillaCommand{
}
if(count($args) === 4){
if($target->isValid()){
$world = $target->getWorld();
$pos = $sender instanceof Player ? $sender->getPosition() : $world->getSpawnLocation();
$x = $this->getRelativeDouble($pos->x, $sender, $args[1]);
$y = $this->getRelativeDouble($pos->y, $sender, $args[2], 0, World::Y_MAX);
$z = $this->getRelativeDouble($pos->z, $sender, $args[3]);
$target->setSpawn(new Position($x, $y, $z, $world));
$world = $target->getWorld();
$pos = $sender instanceof Player ? $sender->getPosition() : $world->getSpawnLocation();
$x = $this->getRelativeDouble($pos->x, $sender, $args[1]);
$y = $this->getRelativeDouble($pos->y, $sender, $args[2], 0, World::Y_MAX);
$z = $this->getRelativeDouble($pos->z, $sender, $args[3]);
$target->setSpawn(new Position($x, $y, $z, $world));
Command::broadcastCommandMessage($sender, new TranslationContainer("commands.spawnpoint.success", [$target->getName(), round($x, 2), round($y, 2), round($z, 2)]));
Command::broadcastCommandMessage($sender, new TranslationContainer("commands.spawnpoint.success", [$target->getName(), round($x, 2), round($y, 2), round($z, 2)]));
return true;
}
return true;
}elseif(count($args) <= 1){
if($sender instanceof Player){
$pos = new Position($sender->getFloorX(), $sender->getFloorY(), $sender->getFloorZ(), $sender->getWorld());

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

@ -101,7 +101,7 @@ class TeleportCommand extends VanillaCommand{
Command::broadcastCommandMessage($sender, new TranslationContainer("commands.tp.success", [$origin->getName(), $target->getName()]));
return true;
}elseif($target->isValid()){
}else{
if(count($args) === 4 or count($args) === 6){
$pos = 1;
}else{
@ -124,7 +124,5 @@ class TeleportCommand extends VanillaCommand{
return true;
}
throw new InvalidCommandSyntaxException();
}
}