Merge branch 'master' of github.com:MassiveCraft/Factions

src/com/massivecraft/factions/Conf.java

@@ -22,7 +22,7 @@ public class Conf
 	public static double powerPerMinute = 0.2; // Default health rate... it takes 5 min to heal one power
 	public static double powerPerDeath = 4.0; // A death makes you lose 4 power
 	public static boolean powerRegenOffline = false;  // does player power regenerate even while they're offline?
-	public static double powerOfflineLossPerDay = 1.0;  // players will lose this much power per day offline
+	public static double powerOfflineLossPerDay = 0.0;  // players will lose this much power per day offline
 	public static double powerOfflineLossLimit = 0.0;  // players will no longer lose power from being offline once their power drops to this amount or less
 	public static double powerFactionMax = 0.0;  // if greater than 0, the cap on how much power a faction can have (additional power from players beyond that will act as a "buffer" of sorts)
 	
@@ -61,7 +61,7 @@ public class Conf
 	public static String factionChatFormat = "%s:"+ChatColor.WHITE+" %s";
 	public static String allianceChatFormat = ChatColor.LIGHT_PURPLE+"%s:"+ChatColor.WHITE+" %s";
 	
-	public static double autoLeaveAfterDaysOfInactivity = 14.0;
+	public static double autoLeaveAfterDaysOfInactivity = 10.0;
 	
 	public static boolean worldGuardChecking = false;
 	

src/com/massivecraft/factions/zcore/MPlugin.java

@@ -122,6 +122,11 @@ public abstract class MPlugin extends JavaPlugin
 		Bukkit.getServer().getPluginManager().registerEvent(type, listener, priority, this);
 	}
 	
+	public void registerEvent(Event.Type type, Listener listener)
+	{
+		registerEvent(type, listener, Event.Priority.Normal);
+	}
+	
 	// -------------------------------------------- //
 	// Some inits...
 	// You are supposed to override these in the plugin if you aren't satisfied with the defaults

src/com/massivecraft/factions/zcore/MPluginSecretServerListener.java

@@ -19,6 +19,7 @@ public class MPluginSecretServerListener extends ServerListener
 		// reference command will be used to prevent "unknown command" console messages
 		try
 		{
+			@SuppressWarnings("unchecked")
 			Map<String, Object> refCmd = (Map<String, Object>) p.getDescription().getCommands();
 			if (refCmd != null && !refCmd.isEmpty())
 				refCommand = (String)(refCmd.keySet().toArray()[0]);