diff --git a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java index 74126e853..91dd2d614 100644 --- a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java +++ b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java @@ -73,7 +73,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaVe if (getConfig().getBoolean("simulate-pt", true)) new ViaIdleThread(portedPlayers).runTaskTimerAsynchronously(this, 1L, 1L); // Updates player's idle status - if (getConfig().getBoolean("checkforupdates")) + if (isCheckForUpdates()) UpdateUtil.sendUpdateMessage(this); Bukkit.getPluginManager().registerEvents(new UpdateListener(this), this); @@ -281,6 +281,10 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaVe this.debug = value; } + public boolean isCheckForUpdates() { + return getConfig().getBoolean("checkforupdates", true); + } + public boolean isPreventCollision() { return getConfig().getBoolean("prevent-collision", true); } diff --git a/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java b/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java index ff741e632..6f4055505 100644 --- a/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java +++ b/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java @@ -9,6 +9,13 @@ public interface ViaVersionConfig { */ boolean isDebug(); + /** + * Get if the plugin should check for updates + * + * @return true if update checking is enabled + */ + boolean isCheckForUpdates(); + /** * Get if collision preventing for players is enabled * diff --git a/src/main/java/us/myles/ViaVersion/commands/ViaVersionCommand.java b/src/main/java/us/myles/ViaVersion/commands/ViaVersionCommand.java index 17c3abe73..791f5fb53 100644 --- a/src/main/java/us/myles/ViaVersion/commands/ViaVersionCommand.java +++ b/src/main/java/us/myles/ViaVersion/commands/ViaVersionCommand.java @@ -48,12 +48,12 @@ public class ViaVersionCommand implements CommandExecutor { } sender.sendMessage(color("&6Leak detector is now " + (ResourceLeakDetector.getLevel() == ResourceLeakDetector.Level.ADVANCED ? "&aenabled" : "&cdisabled"))); } else if (args[0].equalsIgnoreCase("dontbugme")) { - boolean newValue = !plugin.getConfig().getBoolean("checkforupdates", true); + boolean newValue = !plugin.isCheckForUpdates(); plugin.getConfig().set("checkforupdates", newValue); plugin.saveConfig(); sender.sendMessage(color("&6We will " + (newValue ? "&anotify you about updates." : "&cnot tell you about updates."))); } else if (args[0].equalsIgnoreCase("autoteam")) { - boolean newValue = !plugin.getConfig().getBoolean("auto-team", true); + boolean newValue = !plugin.isAutoTeam(); plugin.getConfig().set("auto-team", newValue); plugin.saveConfig(); sender.sendMessage(color("&6We will " + (newValue ? "&aautomatically team players" : "&cno longer auto team players"))); diff --git a/src/main/java/us/myles/ViaVersion/update/UpdateListener.java b/src/main/java/us/myles/ViaVersion/update/UpdateListener.java index 36220b02f..d5e0fa5e3 100644 --- a/src/main/java/us/myles/ViaVersion/update/UpdateListener.java +++ b/src/main/java/us/myles/ViaVersion/update/UpdateListener.java @@ -4,17 +4,17 @@ import lombok.RequiredArgsConstructor; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.plugin.Plugin; +import us.myles.ViaVersion.ViaVersionPlugin; @RequiredArgsConstructor public class UpdateListener implements Listener { - private final Plugin plugin; + private final ViaVersionPlugin plugin; @EventHandler public void onJoin(PlayerJoinEvent e) { if (e.getPlayer().hasPermission("viaversion.update") - && plugin.getConfig().getBoolean("checkforupdates", true)) { + && plugin.isCheckForUpdates()) { UpdateUtil.sendUpdateMessage(e.getPlayer().getUniqueId(), plugin); } }