diff options
Diffstat (limited to '')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/MylesAndMore/tumble/EventListener.java b/src/main/java/com/MylesAndMore/tumble/EventListener.java index 1009ab3..6c20a80 100644 --- a/src/main/java/com/MylesAndMore/tumble/EventListener.java +++ b/src/main/java/com/MylesAndMore/tumble/EventListener.java @@ -16,11 +16,11 @@ public class EventListener implements Listener{ event.setJoinMessage(null); } // If the gameWorld and lobbyWorld is not null, then check - if (TumbleManager.getPlugin().getConfig().getString("gameWorld") != null && TumbleManager.getPlugin().getConfig().getString("lobbyWorld") != null) { + if (TumbleManager.getGameWorld() != null && TumbleManager.getLobbyWorld() != null) { // if the player joining is in the game world, then - if (event.getPlayer().getWorld() == Bukkit.getWorld(TumbleManager.getPlugin().getConfig().getString("gameWorld"))) { + if (event.getPlayer().getWorld() == Bukkit.getWorld(TumbleManager.getGameWorld())) { // send them back to the lobby. - event.getPlayer().teleport(Bukkit.getWorld(TumbleManager.getPlugin().getConfig().getString("lobbyWorld")).getSpawnLocation()); + event.getPlayer().teleport(Bukkit.getWorld(TumbleManager.getLobbyWorld()).getSpawnLocation()); } } } diff --git a/src/main/java/com/MylesAndMore/tumble/Main.java b/src/main/java/com/MylesAndMore/tumble/Main.java index 1445a3e..513b7d1 100644 --- a/src/main/java/com/MylesAndMore/tumble/Main.java +++ b/src/main/java/com/MylesAndMore/tumble/Main.java @@ -24,11 +24,11 @@ public class Main extends JavaPlugin{ Metrics metrics = new Metrics(this, 16940); // Check if worlds are null in config - if (TumbleManager.getPlugin().getConfig().getString("gameWorld") == null) { + if (TumbleManager.getGameWorld() == null) { Bukkit.getServer().getLogger().warning("It appears you have not configured a game world for Tumble."); Bukkit.getServer().getLogger().info("If this is your first time running the plugin, you may disregard this message."); } - if (TumbleManager.getPlugin().getConfig().getString("lobbyWorld") == null) { + if (TumbleManager.getLobbyWorld() == null) { Bukkit.getServer().getLogger().warning("It appears you have not configured a lobby world for Tumble."); Bukkit.getServer().getLogger().info("If this is your first time running the plugin, you may disregard this message."); } diff --git a/src/main/java/com/MylesAndMore/tumble/commands/SetWorldConfig.java b/src/main/java/com/MylesAndMore/tumble/commands/SetWorldConfig.java index 5b5b782..d27a5a8 100644 --- a/src/main/java/com/MylesAndMore/tumble/commands/SetWorldConfig.java +++ b/src/main/java/com/MylesAndMore/tumble/commands/SetWorldConfig.java @@ -24,7 +24,7 @@ public class SetWorldConfig implements CommandExecutor { // Check if the world is actually a world on the server if (Bukkit.getWorld(world) != null) { // Check if the world has already been configured - if (!Objects.equals(TumbleManager.getPlugin().getConfig().getString("gameWorld"), world)) { + if (!Objects.equals(TumbleManager.getGameWorld(), world)) { // Set the specified value of the world in the config under lobbyWorld TumbleManager.getPlugin().getConfig().set("lobbyWorld", world); // Save said config @@ -46,7 +46,7 @@ public class SetWorldConfig implements CommandExecutor { // Check if the world type is game else if (Objects.equals(args[1], "game")) { if (Bukkit.getWorld(world) != null) { - if (!Objects.equals(TumbleManager.getPlugin().getConfig().getString("lobbyWorld"), world)) { + if (!Objects.equals(TumbleManager.getLobbyWorld(), world)) { TumbleManager.getPlugin().getConfig().set("gameWorld", world); TumbleManager.getPlugin().saveConfig(); sender.sendMessage(ChatColor.GREEN + "Game world successfully linked: " + ChatColor.GRAY + world); |