From 32f6cfdcbf54ec29396ec3e8cf5a1a1eb888d82b Mon Sep 17 00:00:00 2001 From: kaenganxt Date: Sat, 13 Dec 2014 15:34:43 +0100 Subject: [PATCH] Remove plugin from LanguageSupport as it is not needed --- src/de/anura/core/LanguageSupport.java | 4 +--- src/de/anura/core/Setup.java | 2 +- src/de/anura/core/commands/AdminCommands.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/de/anura/core/LanguageSupport.java b/src/de/anura/core/LanguageSupport.java index 89204cb..10a9dac 100644 --- a/src/de/anura/core/LanguageSupport.java +++ b/src/de/anura/core/LanguageSupport.java @@ -7,12 +7,10 @@ import org.bukkit.ChatColor; public class LanguageSupport { - private final AnuraCore plugin; public HashMap languages = new HashMap<>(); private HashMap> languageValues = new HashMap<>(); - public LanguageSupport(AnuraCore plugin) { - this.plugin = plugin; + public LanguageSupport() { try { ResultSet al = AnuraCore.sql.querySelect("SELECT name, short_name FROM coreAvailableLanguages"); if (!al.next()) { diff --git a/src/de/anura/core/Setup.java b/src/de/anura/core/Setup.java index 9ee16f4..8119182 100644 --- a/src/de/anura/core/Setup.java +++ b/src/de/anura/core/Setup.java @@ -89,7 +89,7 @@ public class Setup { public static void setupClasses() { try { - Core.getMainClass().lang = new LanguageSupport(Core.getMainClass()); + Core.getMainClass().lang = new LanguageSupport(); new Inventories(Core.getMainClass()); setupInventories(); Core.getMainClass().perms = new Permissions(Core.getMainClass()); diff --git a/src/de/anura/core/commands/AdminCommands.java b/src/de/anura/core/commands/AdminCommands.java index f02f700..d8f6672 100644 --- a/src/de/anura/core/commands/AdminCommands.java +++ b/src/de/anura/core/commands/AdminCommands.java @@ -52,7 +52,7 @@ public class AdminCommands implements CommandExecutor { if ((args[0].equalsIgnoreCase("reload") || args[0].equalsIgnoreCase("rl")) && sender.isOp()) { try { Core.getMainClass().getConfig().load(new File("plugins/Core/", "config.yml")); - Core.getMainClass().lang = new LanguageSupport(Core.getMainClass()); + Core.getMainClass().lang = new LanguageSupport(); Core.statusMsg(sender, "config_rl_done", true); } catch (IOException ex) { Core.statusMsg(sender, "config_rl_error_io", false);