Fixed Spout config files loading / generating when they shouldn't have

This commit is contained in:
GJ 2013-01-28 08:15:12 -05:00
parent d744c6a46d
commit 1118cd8ca1
4 changed files with 13 additions and 4 deletions

View File

@ -16,6 +16,7 @@ Version 1.4.00-dev
+ Added '/party disband' command, kicks out all members and deletes the party + Added '/party disband' command, kicks out all members and deletes the party
+ Added '/ptp toggle' command, to disable party teleportation. + Added '/ptp toggle' command, to disable party teleportation.
+ Added '/ptp accept' and '/ptp deny' commands + Added '/ptp accept' and '/ptp deny' commands
= Fixed Spout config files loading / generating when they shouldn't have
= Fixed mod config files loading / generating when they shouldn't have = Fixed mod config files loading / generating when they shouldn't have
= Fixed bug where Green Terra could activate on crops that weren't fully grown. = Fixed bug where Green Terra could activate on crops that weren't fully grown.
= Fixed several typos relating to locale string display = Fixed several typos relating to locale string display

View File

@ -26,7 +26,7 @@ public class PlayerProfile {
/* HUD */ /* HUD */
private SpoutHud spoutHud; private SpoutHud spoutHud;
private HudType hudType = SpoutConfig.getInstance().defaultHudType; private HudType hudType;
/* Party Stuff */ /* Party Stuff */
private Party party; private Party party;
@ -67,6 +67,13 @@ public class PlayerProfile {
this.playerName = playerName; this.playerName = playerName;
party = PartyManager.getPlayerParty(playerName); party = PartyManager.getPlayerParty(playerName);
if (mcMMO.spoutEnabled) {
hudType = SpoutConfig.getInstance().defaultHudType;
}
else {
hudType = HudType.DISABLED;
}
for (AbilityType abilityType : AbilityType.values()) { for (AbilityType abilityType : AbilityType.values()) {
skillsDATS.put(abilityType, 0); skillsDATS.put(abilityType, 0);
} }
@ -464,7 +471,7 @@ public class PlayerProfile {
out.append(0 + ":"); //DATS out.append(0 + ":"); //DATS
out.append(0 + ":"); //DATS out.append(0 + ":"); //DATS
out.append(0 + ":"); //DATS out.append(0 + ":"); //DATS
out.append(SpoutConfig.getInstance().defaultHudType.toString() + ":");//HUD out.append(hudType.toString() + ":");//HUD
out.append(0 + ":"); //Fishing out.append(0 + ":"); //Fishing
out.append(0 +":"); //FishingXP out.append(0 +":"); //FishingXP
out.append(0 + ":"); //Blast Mining out.append(0 + ":"); //Blast Mining

View File

@ -37,7 +37,7 @@ public class SpoutStuff {
public final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator; public final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator;
public final static String soundDirectory = spoutDirectory + "Sound" + File.separator; public final static String soundDirectory = spoutDirectory + "Sound" + File.separator;
public static boolean showPowerLevel = SpoutConfig.getInstance().getShowPowerLevel(); public static boolean showPowerLevel;
private final static SpoutListener spoutListener = new SpoutListener(); private final static SpoutListener spoutListener = new SpoutListener();
public static Keyboard menuKey; public static Keyboard menuKey;
@ -161,6 +161,7 @@ public class SpoutStuff {
* Setup Spout config options * Setup Spout config options
*/ */
public static void setupSpoutConfigs() { public static void setupSpoutConfigs() {
showPowerLevel = SpoutConfig.getInstance().getShowPowerLevel();
String temp = SpoutConfig.getInstance().getMenuKey(); String temp = SpoutConfig.getInstance().getMenuKey();
for (Keyboard x : Keyboard.values()) { for (Keyboard x : Keyboard.values()) {

View File

@ -27,7 +27,7 @@ public class XplockCommand implements CommandExecutor {
return true; return true;
} }
if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) { if (!mcMMO.spoutEnabled || !Config.getInstance().getCommandXPLockEnabled() || !SpoutConfig.getInstance().getXPBarEnabled()) {
sender.sendMessage(LocaleLoader.getString("Commands.Disabled")); sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
return true; return true;
} }