Merge branch 'refs/heads/master' into 3.0

The changes to EssChat have not been merged

Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
	Essentials/src/com/earth2me/essentials/ISettings.java
	Essentials/src/com/earth2me/essentials/OfflinePlayer.java
	Essentials/src/com/earth2me/essentials/Settings.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java
	Essentials/src/messages.properties
	Essentials/src/messages_da.properties
	Essentials/src/messages_de.properties
	Essentials/src/messages_en.properties
	Essentials/src/messages_es.properties
	Essentials/src/messages_fr.properties
	Essentials/src/messages_nl.properties
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
	EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
	EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
	EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java

10 files changed, 102 insertions, 131 deletions

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyBlockListener.java
deleted file mode 100644
index 479d2eda6..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyBlockListener.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.earth2me.essentials.protect;
-
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockListener;
-
-
-public class EmergencyBlockListener extends BlockListener
-{
-
-	@Override
-	public void onBlockBurn(final BlockBurnEvent event)
-	{
-		event.setCancelled(true);
-	}
-
-	@Override
-	public void onBlockIgnite(final BlockIgniteEvent event)
-	{
-		event.setCancelled(true);
-	}
-
-	@Override
-	public void onBlockFromTo(final BlockFromToEvent event)
-	{
-		event.setCancelled(true);
-	}
-
-	@Override
-	public void onBlockBreak(final BlockBreakEvent event)
-	{
-		event.setCancelled(true);
-	}
-}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyEntityListener.java
deleted file mode 100644
index a220f07d5..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyEntityListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.earth2me.essentials.protect;
-
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.EntityListener;
-
-
-public class EmergencyEntityListener extends EntityListener
-{
-
-	@Override
-	public void onEntityExplode(final EntityExplodeEvent event)
-	{
-		event.setCancelled(true);
-	}
-
-	@Override
-	public void onEntityDamage(final EntityDamageEvent event)
-	{
-		event.setCancelled(true);
-	}
-}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java
new file mode 100644
index 000000000..5f9253c55
--- /dev/null
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java
@@ -0,0 +1,58 @@
+package com.earth2me.essentials.protect;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+
+public class EmergencyListener implements Listener
+{
+	@EventHandler(priority = EventPriority.LOW)
+	public void onBlockBurn(final BlockBurnEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onBlockIgnite(final BlockIgniteEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onBlockFromTo(final BlockFromToEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onBlockBreak(final BlockBreakEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onPlayerJoin(final PlayerJoinEvent event)
+	{
+		event.getPlayer().sendMessage("Essentials Protect is in emergency mode. Check your log for errors.");
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onEntityExplode(final EntityExplodeEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onEntityDamage(final EntityDamageEvent event)
+	{
+		event.setCancelled(true);
+	}
+}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyPlayerListener.java
deleted file mode 100644
index e92325946..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyPlayerListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.earth2me.essentials.protect;
-
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerListener;
-
-
-public class EmergencyPlayerListener extends PlayerListener
-{
-
-	@Override
-	public void onPlayerJoin(PlayerJoinEvent event)
-	{
-		event.getPlayer().sendMessage("Essentials Protect is in emergency mode. Check your log for errors.");
-	}
-	
-}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
index 38c6cc3f9..5988bd06f 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
@@ -33,8 +33,6 @@ public class EssentialsConnect
 		ProtectReloader pr = new ProtectReloader();
 		pr.onReload();
 		ess.addReloadListener(pr);
-		LOGGER.info(_("loadinfo", essProtect.getDescription().getName(), essProtect.getDescription().getVersion(), "essentials team"));
-
 	}
 
 	public void onDisable()
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
index 43975216e..75a462888 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
@@ -6,8 +6,6 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event.Type;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -49,43 +47,22 @@ public class EssentialsProtect extends JavaPlugin implements IProtect
 		ess = new EssentialsConnect(essPlugin, this);
 
 		final EssentialsProtectPlayerListener playerListener = new EssentialsProtectPlayerListener(this);
-		pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Low, this);
+		pm.registerEvents(playerListener, this);
 
 		final EssentialsProtectBlockListener blockListener = new EssentialsProtectBlockListener(this);
-		pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_FROMTO, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_IGNITE, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_BURN, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_PISTON_EXTEND, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_PISTON_RETRACT, blockListener, Priority.Highest, this);
+		pm.registerEvents(blockListener, this);
 
 		final EssentialsProtectEntityListener entityListener = new EssentialsProtectEntityListener(this);
-		pm.registerEvent(Type.ENTITY_EXPLODE, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.CREATURE_SPAWN, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.ENTITY_TARGET, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.EXPLOSION_PRIME, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.ENDERMAN_PICKUP, entityListener, Priority.Highest, this);
+		pm.registerEvents(entityListener, this);
 
 		final EssentialsProtectWeatherListener weatherListener = new EssentialsProtectWeatherListener(this);
-		pm.registerEvent(Type.LIGHTNING_STRIKE, weatherListener, Priority.Highest, this);
-		pm.registerEvent(Type.THUNDER_CHANGE, weatherListener, Priority.Highest, this);
-		pm.registerEvent(Type.WEATHER_CHANGE, weatherListener, Priority.Highest, this);
+		pm.registerEvents(weatherListener, this);
 	}
 
 	private void enableEmergencyMode(final PluginManager pm)
 	{
-		final EmergencyBlockListener emBlockListener = new EmergencyBlockListener();
-		final EmergencyEntityListener emEntityListener = new EmergencyEntityListener();
-		final EmergencyPlayerListener emPlayerListener = new EmergencyPlayerListener();
-		pm.registerEvent(Type.PLAYER_JOIN, emPlayerListener, Priority.Low, this);
-		pm.registerEvent(Type.BLOCK_BURN, emBlockListener, Priority.Low, this);
-		pm.registerEvent(Type.BLOCK_IGNITE, emBlockListener, Priority.Low, this);
-		pm.registerEvent(Type.BLOCK_FROMTO, emBlockListener, Priority.Low, this);
-		pm.registerEvent(Type.BLOCK_BREAK, emBlockListener, Priority.Low, this);
-		pm.registerEvent(Type.ENTITY_DAMAGE, emEntityListener, Priority.Low, this);
-		pm.registerEvent(Type.ENTITY_EXPLODE, emEntityListener, Priority.Low, this);
+		final EmergencyListener emListener = new EmergencyListener();
+		pm.registerEvents(emListener, this);
 		for (Player player : getServer().getOnlinePlayers())
 		{
 			player.sendMessage("Essentials Protect is in emergency mode. Check your log for errors.");
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
index 0e3fb6a5e..cdd0c2543 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
@@ -9,10 +9,13 @@ import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.*;
 
 
-public class EssentialsProtectBlockListener extends BlockListener
+public class EssentialsProtectBlockListener implements Listener
 {
 	final private transient IProtect prot;
 	final private transient IEssentials ess;
@@ -23,7 +26,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 		this.ess = prot.getEssentialsConnect().getEssentials();
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onBlockPlace(final BlockPlaceEvent event)
 	{
 		if (event.isCancelled())
@@ -102,7 +105,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onBlockIgnite(BlockIgniteEvent event)
 	{
 		if (event.isCancelled())
@@ -162,7 +165,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onBlockFromTo(final BlockFromToEvent event)
 	{
 		if (event.isCancelled())
@@ -211,7 +214,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onBlockBurn(final BlockBurnEvent event)
 	{
 		if (event.isCancelled())
@@ -257,7 +260,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 		BlockFace.SELF
 	};
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onBlockBreak(final BlockBreakEvent event)
 	{
 		if (event.isCancelled())
@@ -363,8 +366,8 @@ public class EssentialsProtectBlockListener extends BlockListener
 		}
 	}
 
-	@Override
-	public void onBlockPistonExtend(BlockPistonExtendEvent event)
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onBlockPistonExtend(final BlockPistonExtendEvent event)
 	{
 		if (event.isCancelled())
 		{
@@ -425,8 +428,8 @@ public class EssentialsProtectBlockListener extends BlockListener
 		}
 	}
 
-	@Override
-	public void onBlockPistonRetract(BlockPistonRetractEvent event)
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onBlockPistonRetract(final BlockPistonRetractEvent event)
 	{
 		if (event.isCancelled() || !event.isSticky())
 		{
@@ -479,6 +482,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 				}
 			}
 		}
+
 		finally
 		{
 			settings.unlock();
@@ -521,7 +525,8 @@ public class EssentialsProtectBlockListener extends BlockListener
 				}
 			
 		}
-		if (settings.getData().getSignsAndRails().isProtectRails()) {
+		if (settings.getData().getSignsAndRails().isProtectRails())
+		{
 			if (type == Material.RAILS || type == Material.POWERED_RAIL || type == Material.DETECTOR_RAIL)
 			{
 				return prot.getStorage().isProtected(block, user.getName());
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index 99b0c72e7..bba267d41 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -7,12 +7,15 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.*;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
 import org.bukkit.event.entity.*;
 
 
-public class EssentialsProtectEntityListener extends EntityListener
+public class EssentialsProtectEntityListener implements Listener
 {
 	private final transient IProtect prot;
 	private final transient IEssentials ess;
@@ -24,7 +27,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 		this.ess = prot.getEssentialsConnect().getEssentials();
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onEntityDamage(final EntityDamageEvent event)
 	{
 		if (event.isCancelled())
@@ -170,7 +173,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onEntityExplode(final EntityExplodeEvent event)
 	{
 		if (event.isCancelled())
@@ -247,7 +250,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onCreatureSpawn(final CreatureSpawnEvent event)
 	{
 		if (event.getEntity() instanceof Player)
@@ -279,7 +282,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onEntityTarget(final EntityTargetEvent event)
 	{
 		if (event.isCancelled() || !(event.getTarget() instanceof Player))
@@ -300,7 +303,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onExplosionPrime(final ExplosionPrimeEvent event)
 	{
 		final ProtectHolder settings = prot.getSettings();
@@ -319,7 +322,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onEndermanPickup(final EndermanPickupEvent event)
 	{
 		if (event.isCancelled())
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
index b5c7980c2..7fe1ea33f 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
@@ -5,13 +5,15 @@ import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IUser;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerListener;
 import org.bukkit.inventory.ItemStack;
 
 
-public class EssentialsProtectPlayerListener extends PlayerListener
+public class EssentialsProtectPlayerListener implements Listener
 {
 	private final transient IProtect prot;
 	private final transient IEssentials ess;
@@ -22,7 +24,7 @@ public class EssentialsProtectPlayerListener extends PlayerListener
 		this.ess = prot.getEssentialsConnect().getEssentials();
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.LOW)
 	public void onPlayerInteract(final PlayerInteractEvent event)
 	{
 		// Do not return if cancelled, because the interact event has 2 cancelled states.
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java
index 4097275dd..babebac71 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java
@@ -1,12 +1,14 @@
 package com.earth2me.essentials.protect;
 
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.weather.LightningStrikeEvent;
 import org.bukkit.event.weather.ThunderChangeEvent;
 import org.bukkit.event.weather.WeatherChangeEvent;
-import org.bukkit.event.weather.WeatherListener;
 
 
-public class EssentialsProtectWeatherListener extends WeatherListener
+public class EssentialsProtectWeatherListener implements Listener
 {
 	private final transient IProtect prot;
 
@@ -15,7 +17,7 @@ public class EssentialsProtectWeatherListener extends WeatherListener
 		this.prot = prot;
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onWeatherChange(final WeatherChangeEvent event)
 	{
 		final ProtectHolder settings = prot.getSettings();
@@ -35,7 +37,7 @@ public class EssentialsProtectWeatherListener extends WeatherListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onLightningStrike(final LightningStrikeEvent event)
 	{
 		final ProtectHolder settings = prot.getSettings();
@@ -54,7 +56,7 @@ public class EssentialsProtectWeatherListener extends WeatherListener
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onThunderChange(final ThunderChangeEvent event)
 	{
 		final ProtectHolder settings = prot.getSettings();