diff options
Diffstat (limited to '')
4 files changed, 19 insertions, 8 deletions
diff --git a/src/main/java/com/MylesAndMore/tumble/EventListener.java b/src/main/java/com/MylesAndMore/tumble/EventListener.java index 9ce5e24..8597e81 100644 --- a/src/main/java/com/MylesAndMore/tumble/EventListener.java +++ b/src/main/java/com/MylesAndMore/tumble/EventListener.java @@ -9,6 +9,9 @@ import org.bukkit.event.player.PlayerQuitEvent; public class EventListener implements Listener{ @EventHandler public void PlayerJoinEvent(PlayerJoinEvent event){ + // On a PlayerJoinEvent, check if the config is set to hide the join/leave messages + // If true, null out the join message (which just makes it so that there is no message) + // If false, nothing will happen, and the default message will display if (Bukkit.getServer().getPluginManager().getPlugin("tumble").getConfig().getBoolean("hideJoinLeaveMessages")) { event.setJoinMessage(null); } @@ -16,6 +19,9 @@ public class EventListener implements Listener{ @EventHandler public void PlayerQuitEvent(PlayerQuitEvent event){ + // On a PlayerQuitEvent, check if the config is set to hide the join/leave messages + // If true, null out the quit message (which just makes it so that there is no message) + // If false, nothing will happen, and the default message will display if (Bukkit.getServer().getPluginManager().getPlugin("tumble").getConfig().getBoolean("hideJoinLeaveMessages")) { event.setQuitMessage(null); } diff --git a/src/main/java/com/MylesAndMore/tumble/Main.java b/src/main/java/com/MylesAndMore/tumble/Main.java index d99fbc3..4228e16 100644 --- a/src/main/java/com/MylesAndMore/tumble/Main.java +++ b/src/main/java/com/MylesAndMore/tumble/Main.java @@ -11,7 +11,7 @@ public class Main extends JavaPlugin{ getServer().getPluginManager().registerEvents(new EventListener(), this); // Register commands this.getCommand("reload").setExecutor(new ReloadCommand()); - // Register our config file + // Save the default config file (packaged in the JAR) this.saveDefaultConfig(); // Register bStats diff --git a/src/main/java/com/MylesAndMore/tumble/api/Metrics.java b/src/main/java/com/MylesAndMore/tumble/api/Metrics.java index b05119b..411a918 100644 --- a/src/main/java/com/MylesAndMore/tumble/api/Metrics.java +++ b/src/main/java/com/MylesAndMore/tumble/api/Metrics.java @@ -1,3 +1,5 @@ +// Do NOT remove this file! The build will fail--it is to enable bStats. + /* * This Metrics class was auto-generated and can be copied into your project if you are * not using a build tool like Gradle or Maven for dependency management. diff --git a/src/main/java/com/MylesAndMore/tumble/commands/ReloadCommand.java b/src/main/java/com/MylesAndMore/tumble/commands/ReloadCommand.java index 9823259..05fdce0 100644 --- a/src/main/java/com/MylesAndMore/tumble/commands/ReloadCommand.java +++ b/src/main/java/com/MylesAndMore/tumble/commands/ReloadCommand.java @@ -9,13 +9,16 @@ import org.bukkit.command.CommandSender; public class ReloadCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - if (!sender.hasPermission("tumble.reload")) { - sender.sendMessage(ChatColor.RED + Bukkit.getServer().getPluginManager().getPlugin("tumble").getConfig().getString("permissionMessage")); - } - else { - Bukkit.getServer().getPluginManager().getPlugin("tumble").reloadConfig(); - sender.sendMessage(ChatColor.GREEN + "Tumble configuration reloaded successfully."); - } + // Check if the sender has perms to run command + if (!sender.hasPermission("tumble.reload")) { + // If sender does not have permission, display them the permissionMessage from the config + sender.sendMessage(ChatColor.RED + Bukkit.getServer().getPluginManager().getPlugin("tumble").getConfig().getString("permissionMessage")); + } + else { + // If sender does have permission, reload the plugin's config and display a confirmation message + Bukkit.getServer().getPluginManager().getPlugin("tumble").reloadConfig(); + sender.sendMessage(ChatColor.GREEN + "Tumble configuration reloaded successfully."); + } return true; } } |