Skip to content

Commit

Permalink
My favourite poggit-reviewer said that it's smarter that way.
Browse files Browse the repository at this point in the history
  • Loading branch information
@supercrafter333
supercrafter333 committed Dec 4, 2021
1 parent 273a0c8 commit e5914ff
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/supercrafter333/theSpawn/Aliases.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function execute(CommandSender $s, string $commandLabel, array $args): bo
Server::getInstance()->getWorldManager()->loadWorld($lvl);
$level = Server::getInstance()->getWorldManager()->getWorldByName($lvl);
$s->teleport($pl->getSpawn($level));
$s->sendMessage(theSpawn::$prefix . str_replace(["{alias}"], [$this->cmdName], str_replace(["{world}"], [$level->getDisplayName()], MsgMgr::getMsg("alias-teleport"))));
$s->sendMessage(theSpawn::$prefix . str_replace(["{alias}"], [$this->cmdName], str_replace(["{world}"], [$level->getFolderName()], MsgMgr::getMsg("alias-teleport"))));
$s->getWorld()->addSound($s->getPosition(), new PopSound());
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/supercrafter333/theSpawn/Commands/DelspawnCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function execute(CommandSender $s, string $commandLabel, array $args): bo
#########################
if ($s instanceof Player) {
if ($s->hasPermission("theSpawn.delspawn.cmd")) {
$levelname = $s->getWorld()->getDisplayName();
$levelname = $s->getWorld()->getFolderName();
$level = $pl->getServer()->getWorldManager()->getWorldByName($levelname);
if ($spawn->exists($levelname)) {
$pl->removeSpawn($level);
Expand Down
4 changes: 2 additions & 2 deletions src/supercrafter333/theSpawn/Commands/HubCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function execute(CommandSender $s, string $commandLabel, array $args): bo
$hubPos = $pl->getRandomHub();
if ($hubPos !== null) {
$s->teleport($hubPos);
$s->sendMessage($prefix . str_replace(["{world}"], [$hubPos->getWorld()->getDisplayName()], MsgMgr::getMsg("hub-tp")));
$s->sendMessage($prefix . str_replace(["{world}"], [$hubPos->getWorld()->getFolderName()], MsgMgr::getMsg("hub-tp")));
$s->getWorld()->addSound($s->getPosition(), new PopSound());
} else {
$s->sendMessage($prefix . MsgMgr::getMsg("world-not-found-hub"));
Expand All @@ -69,7 +69,7 @@ public function execute(CommandSender $s, string $commandLabel, array $args): bo
$hublevel = $pl->getHub()->getWorld();
if ($hublevel !== null) {
$s->teleport($pl->getHub());
$s->sendMessage($prefix . str_replace(["{world}"], [$hublevel->getDisplayName()], MsgMgr::getMsg("hub-tp")));
$s->sendMessage($prefix . str_replace(["{world}"], [$hublevel->getFolderName()], MsgMgr::getMsg("hub-tp")));
$s->getWorld()->addSound($s->getPosition(), new PopSound());
} else {
$s->sendMessage($prefix . MsgMgr::getMsg("world-not-found-hub"));
Expand Down
2 changes: 1 addition & 1 deletion src/supercrafter333/theSpawn/Commands/SethubCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function execute(CommandSender $s, string $commandLabel, array $args): bo
$x = $s->getPosition()->getX();
$y = $s->getPosition()->getY();
$z = $s->getPosition()->getZ();
$levelname = $s->getWorld()->getDisplayName();
$levelname = $s->getWorld()->getFolderName();
$level = $s->getWorld();
if ($pl->getUseHubServer() == false) {
if ($level === null) {
Expand Down
2 changes: 1 addition & 1 deletion src/supercrafter333/theSpawn/Commands/SetspawnCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function execute(CommandSender $s, string $commandLabel, array $args): bo
#########################
if ($s instanceof Player) {
if ($s->hasPermission("theSpawn.setspawn.cmd")) {
$levelname = $s->getWorld()->getDisplayName();
$levelname = $s->getWorld()->getFolderName();
$level = $s->getWorld();
$pl->setSpawn($s, $level);
if (!$spawn->exists($levelname)) {
Expand Down
2 changes: 1 addition & 1 deletion src/supercrafter333/theSpawn/Commands/SetwarpCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function execute(CommandSender $s, string $commandLabel, array $args): vo
if ($pl->existsWarp($args[0]) == false) {
$pl->addWarp($s->getPosition()->getX(), $s->getPosition()->getY(), $s->getPosition()->getZ(), $s->getPosition()->getWorld(), $args[0], isset($args[1]) ? $args[1] : null);
$posMsg = (string)$s->getPosition()->getX() . $s->getPosition()->getY() . $s->getPosition()->getZ();
$s->sendMessage($prefix . str_replace(["{warpname}"], [$args[0]], str_replace(["{position}"], [$posMsg], str_replace(["{world}"], [$s->getWorld()->getDisplayName()], MsgMgr::getMsg("warp-set")))));
$s->sendMessage($prefix . str_replace(["{warpname}"], [$args[0]], str_replace(["{position}"], [$posMsg], str_replace(["{world}"], [$s->getWorld()->getFolderName()], MsgMgr::getMsg("warp-set")))));
} else {
$s->sendMessage($prefix . str_replace(["{warpname}"], [$args[0]], MsgMgr::getMsg("warp-already-set")));
}
Expand Down
2 changes: 1 addition & 1 deletion src/supercrafter333/theSpawn/Commands/SpawnCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function execute(CommandSender $s, string $commandLabel, array $args): bo
$config = $pl->getConfig();
#########################
if ($s instanceof Player) {
$levelname = $s->getWorld()->getDisplayName();
$levelname = $s->getWorld()->getFolderName();
$level = $s->getWorld();
if ($spawn->exists($levelname) && $pl->useSpawnDelays()) {
$pl->startSpawnDelay($s);
Expand Down
2 changes: 1 addition & 1 deletion src/supercrafter333/theSpawn/Tasks/SpawnDelayTask.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function onRun(): void
}
if ($this->seconds <= 0) {
$player->teleport(theSpawn::getInstance()->getSpawn($player->getWorld()));
$player->sendMessage(theSpawn::$prefix . str_replace(["{world}"], [$player->getWorld()->getDisplayName()], MsgMgr::getMsg("spawn-tp")));
$player->sendMessage(theSpawn::$prefix . str_replace(["{world}"], [$player->getWorld()->getFolderName()], MsgMgr::getMsg("spawn-tp")));
$player->getWorld()->addSound($player->getPosition(), new PopSound());
theSpawn::getInstance()->stopSpawnDelay($player);
}
Expand Down
28 changes: 14 additions & 14 deletions src/supercrafter333/theSpawn/theSpawn.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,9 @@ public function setHub($x, $y, $z, World $world, int $count = null)
$config = new Config($this->getDataFolder() . "config.yml", Config::YAML);
$hub = new Config($this->getDataFolder() . "theHub.yml", Config::YAML);
$randHub = new Config($this->getDataFolder() . "theRandHubs.yml", Config::YAML);
$hubcoords = ["hub", "X" => $x, "Y" => $y, "Z" => $z, "level" => $world->getDisplayName()];
$hubcoords = ["hub", "X" => $x, "Y" => $y, "Z" => $z, "level" => $world->getFolderName()];
if ($count !== null && $this->getUseRandomHubs()) {
$setRandHub = $x . '|' . $y . '|' . $z . '|' . $world->getDisplayName();
$setRandHub = $x . '|' . $y . '|' . $z . '|' . $world->getFolderName();
$randHub->set($count, $setRandHub);
$randHub->save();
} else {
Expand Down Expand Up @@ -570,11 +570,11 @@ public function getSpawn(?World $world): Position|false
}

$spawn = new Config($this->getDataFolder() . "theSpawns.yml", Config::YAML);
$spawn->get($world->getDisplayName());
if ($spawn->exists($world->getDisplayName())) {
$X = $spawn->get($world->getDisplayName())["X"];
$Y = $spawn->get($world->getDisplayName())["Y"];
$Z = $spawn->get($world->getDisplayName())["Z"];
$spawn->get($world->getFolderName());
if ($spawn->exists($world->getFolderName())) {
$X = $spawn->get($world->getFolderName())["X"];
$Y = $spawn->get($world->getFolderName())["Y"];
$Z = $spawn->get($world->getFolderName())["Z"];
return new Position($X, $Y, $Z, $world);
} else {
return false;
Expand All @@ -592,8 +592,8 @@ public function setSpawn(Player $s, World $world): bool
$x = $s->getPosition()->getX();
$y = $s->getPosition()->getY();
$z = $s->getPosition()->getZ();
$coords = ["X" => $x, "Y" => $y, "Z" => $z, "level" => $world->getDisplayName()];
$spawn->set($world->getDisplayName(), $coords);
$coords = ["X" => $x, "Y" => $y, "Z" => $z, "level" => $world->getFolderName()];
$spawn->set($world->getFolderName(), $coords);
$spawn->save();
return true;
}
Expand Down Expand Up @@ -644,8 +644,8 @@ public function removeHub(int $count = null): bool
public function removeSpawn(World $world): bool
{
$spawn = new Config($this->getDataFolder() . "theSpawns.yml", Config::YAML);
if ($spawn->exists($world->getDisplayName())) {
$spawn->remove($world->getDisplayName());
if ($spawn->exists($world->getFolderName())) {
$spawn->remove($world->getFolderName());
$spawn->save();
return true;
} else {
Expand Down Expand Up @@ -865,7 +865,7 @@ public function setHome(Player $player, string $homeName, $x, $y, $z, World $wor
{
if ($this->existsHome($homeName, $player) == false) {
$home = $this->getHomeCfg($player->getName());
$setThis = ["X" => $x, "Y" => $y, "Z" => $z, "level" => $world->getDisplayName(), "homeName" => $homeName];
$setThis = ["X" => $x, "Y" => $y, "Z" => $z, "level" => $world->getFolderName(), "homeName" => $homeName];
$home->set($homeName, $setThis);
$home->save();
return true;
Expand Down Expand Up @@ -1021,9 +1021,9 @@ public function addWarp($x, $y, $z, World $level, string $warpName, string $perm
//if ($this->existsWarp($warpName) == true) {
$warp = $this->getWarpCfg();
if ($permission === null) {
$setThis = ["X" => $x, "Y" => $y, "Z" => $z, "level" => $level->getDisplayName(), "warpName" => $warpName];
$setThis = ["X" => $x, "Y" => $y, "Z" => $z, "level" => $level->getFolderName(), "warpName" => $warpName];
} else {
$setThis = ["X" => $x, "Y" => $y, "Z" => $z, "level" => $level->getDisplayName(), "warpName" => $warpName, "perm" => $permission];
$setThis = ["X" => $x, "Y" => $y, "Z" => $z, "level" => $level->getFolderName(), "warpName" => $warpName, "perm" => $permission];
}
$warp->set($warpName, $setThis);
$warp->save();
Expand Down

0 comments on commit e5914ff

Please sign in to comment.