diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 03ddc24a0..d4a7491b4 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -12,7 +12,6 @@ import com.gmail.nossr50.listeners.BlockListener; import com.gmail.nossr50.listeners.EntityListener; import com.gmail.nossr50.listeners.PlayerListener; import com.gmail.nossr50.locale.mcLocale; -import com.gmail.nossr50.party.Party; import java.io.File; import java.io.IOException; @@ -74,8 +73,6 @@ public class mcMMO extends JavaPlugin { this.config2 = new LoadTreasures(this); this.config2.load(); - new Party(this).loadParties(); - if (!Config.getInstance().getUseMySQL()) { Users.loadUsers(); } diff --git a/src/main/java/com/gmail/nossr50/party/Party.java b/src/main/java/com/gmail/nossr50/party/Party.java index 72006bd90..bd33c0d97 100644 --- a/src/main/java/com/gmail/nossr50/party/Party.java +++ b/src/main/java/com/gmail/nossr50/party/Party.java @@ -32,18 +32,19 @@ public class Party { private static mcMMO plugin; private static volatile Party instance; - public Party(mcMMO instance) { - plugin = instance; + private Party() { + plugin = mcMMO.p; pluginPath = plugin.getDataFolder().getPath(); partyPlayersFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyPlayers"; partyLocksFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyLocks"; partyPasswordsFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyPasswords"; new File(pluginPath + File.separator + "FlatFileStuff").mkdir(); + loadParties(); } public static Party getInstance() { if (instance == null) { - instance = new Party(plugin); + instance = new Party(); } return instance; }