From 3de70b6db8a50db146d523a639f112a2e271e7b7 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 14 Oct 2011 23:45:39 +0200 Subject: [PATCH 1/2] Changes to the default configuration --- src/com/massivecraft/factions/Conf.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java index 6fd86426..afeb4f02 100644 --- a/src/com/massivecraft/factions/Conf.java +++ b/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 = "%s"+ChatColor.WHITE+" %s"; - public static double autoLeaveAfterDaysOfInactivity = 14.0; + public static double autoLeaveAfterDaysOfInactivity = 10.0; public static boolean worldGuardChecking = false; From aad9819ae94f17e87a26ca0a85a84e88ad15e5ec Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 16 Oct 2011 12:12:49 +0200 Subject: [PATCH 2/2] herp --- src/com/massivecraft/factions/zcore/MPlugin.java | 7 ++++++- .../factions/zcore/MPluginSecretServerListener.java | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/massivecraft/factions/zcore/MPlugin.java b/src/com/massivecraft/factions/zcore/MPlugin.java index 421379cb..ef6def17 100644 --- a/src/com/massivecraft/factions/zcore/MPlugin.java +++ b/src/com/massivecraft/factions/zcore/MPlugin.java @@ -119,7 +119,12 @@ public abstract class MPlugin extends JavaPlugin public void registerEvent(Event.Type type, Listener listener, Event.Priority priority) { - Bukkit.getServer().getPluginManager().registerEvent(type, listener, priority, this); + Bukkit.getServer().getPluginManager().registerEvent(type, listener, priority, this); + } + + public void registerEvent(Event.Type type, Listener listener) + { + registerEvent(type, listener, Event.Priority.Normal); } // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/zcore/MPluginSecretServerListener.java b/src/com/massivecraft/factions/zcore/MPluginSecretServerListener.java index 90e62220..678dc40f 100644 --- a/src/com/massivecraft/factions/zcore/MPluginSecretServerListener.java +++ b/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 refCmd = (Map) p.getDescription().getCommands(); if (refCmd != null && !refCmd.isEmpty()) refCommand = (String)(refCmd.keySet().toArray()[0]);