diff --git a/appinfo.properties b/appinfo.properties index 96e6a3e8..023033ca 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Tue, 03 Sep 2013 20:25:31 -0400 +#Sat, 07 Sep 2013 22:46:21 -0400 program.VERSION=3.2 -program.BUILDNUM=567 -program.BUILDDATE=09/03/2013 08\:25 PM +program.BUILDNUM=575 +program.BUILDDATE=09/07/2013 10\:46 PM diff --git a/buildnumber.properties b/buildnumber.properties index 5eac6fa0..c5bad80e 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Sep 03 20:25:31 EDT 2013 -build.number=568 +#Sat Sep 07 22:46:21 EDT 2013 +build.number=576 diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_config.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_config.java index 868fe25f..7ba18713 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_config.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_config.java @@ -1,6 +1,5 @@ package me.StevenLawson.TotalFreedomMod.Commands; -import me.StevenLawson.TotalFreedomMod.TFM_Config; import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -26,41 +25,40 @@ public class Command_config extends TFM_Command return true; } - boolean valueSet = false; - + Object newValue = null; final String newValueString = args[1].trim(); final Class type = entry.getType(); try { if (type.isAssignableFrom(Integer.class)) { - entry.setInteger(new Integer(newValueString)); - valueSet = true; + newValue = new Integer(newValueString); + entry.setInteger((Integer) newValue); } else if (type.isAssignableFrom(Double.class)) { - entry.setDouble(new Double(newValueString)); - valueSet = true; + newValue = new Double(newValueString); + entry.setDouble((Double) newValue); } else if (type.isAssignableFrom(Boolean.class)) { - entry.setBoolean(Boolean.valueOf(newValueString)); - valueSet = true; + newValue = Boolean.valueOf(newValueString); + entry.setBoolean((Boolean) newValue); } else if (type.isAssignableFrom(String.class)) { - TFM_Config.getInstance().set(entry, newValueString, String.class); - valueSet = true; + newValue = newValueString; + entry.setString((String) newValue); } } catch (Exception ex) { } - if (!valueSet) + if (newValue != null) { sender.sendMessage(String.format("Set configuration entry \"%s\" to \"%s\" value \"%s\".", - entry.toString(), type.getName(), newValueString)); + entry.toString(), type.getName(), newValue.toString())); } else { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java index 763bb0d2..8c2296d9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java @@ -17,7 +17,7 @@ public class Command_fluidspread extends TFM_Command return false; } - playerMsg("Lava and water spread is now " + (TFM_ConfigEntry.ALLOW_FLIUD_SPREAD.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + "."); + playerMsg("Lava and water spread is now " + (TFM_ConfigEntry.ALLOW_FLUID_SPREAD.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + "."); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java index 75d34794..92f9e77e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java @@ -267,7 +267,7 @@ public class TFM_BlockListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onBlockFromTo(BlockFromToEvent event) { - if (!TFM_ConfigEntry.ALLOW_FLIUD_SPREAD.getBoolean()) + if (!TFM_ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean()) { event.setCancelled(true); } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java index 6e4b5ba2..762ca6e4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java @@ -8,7 +8,7 @@ public enum TFM_ConfigEntry ALLOW_EXPLOSIONS(Boolean.class, "allow_explosions"), ALLOW_FIRE_PLACE(Boolean.class, "allow_fire_place"), ALLOW_FIRE_SPREAD(Boolean.class, "allow_fire_spread"), - ALLOW_FLIUD_SPREAD(Boolean.class, "allow_fluid_spread"), + ALLOW_FLUID_SPREAD(Boolean.class, "allow_fluid_spread"), ALLOW_LAVA_DAMAGE(Boolean.class, "allow_lava_damage"), ALLOW_LAVA_PLACE(Boolean.class, "allow_lava_place"), ALLOW_TNT_MINECARTS(Boolean.class, "allow_tnt_minecarts"), diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java index 72f12722..1135f5a4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java @@ -246,7 +246,7 @@ public class TFM_FrontDoor { message = false; } - else if (TFM_ConfigEntry.ALLOW_FLIUD_SPREAD.getBoolean()) + else if (TFM_ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean()) { message = false; } @@ -257,7 +257,7 @@ public class TFM_FrontDoor TFM_ConfigEntry.ALLOW_WATER_PLACE.setBoolean(true); TFM_ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(true); - TFM_ConfigEntry.ALLOW_FLIUD_SPREAD.setBoolean(true); + TFM_ConfigEntry.ALLOW_FLUID_SPREAD.setBoolean(true); TFM_ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(true); if (message)