summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2012-01-20 05:20:37 +0100
committersnowleo <schneeleo@gmail.com>2012-01-20 05:20:37 +0100
commit792f70efa5f3a47f642360e97979fe841593384c (patch)
treebf119f53a3426f1016457d066820eb334eb393ac /EssentialsXMPP
parent46298ae85895574a097b1dd10c46196ffa1a42d3 (diff)
downloadEssentials-792f70efa5f3a47f642360e97979fe841593384c.tar
Essentials-792f70efa5f3a47f642360e97979fe841593384c.tar.gz
Essentials-792f70efa5f3a47f642360e97979fe841593384c.tar.lz
Essentials-792f70efa5f3a47f642360e97979fe841593384c.tar.xz
Essentials-792f70efa5f3a47f642360e97979fe841593384c.zip
Update for new CraftBukkit Event Code
EssentialsSpawn can't be updated yet, because the new event system lacks dynamic priorities.
Diffstat (limited to 'EssentialsXMPP')
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java4
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java12
2 files changed, 8 insertions, 8 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
index bcbbfa17d..65925c00a 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
@@ -47,9 +47,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
}
final EssentialsXMPPPlayerListener playerListener = new EssentialsXMPPPlayerListener(ess);
- pluginManager.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
- pluginManager.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Monitor, this);
- pluginManager.registerEvent(Type.PLAYER_QUIT, playerListener, Priority.Monitor, this);
+ pluginManager.registerEvents(playerListener, this);
users = new UserManager(this.getDataFolder());
xmpp = new XMPPManager(this);
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
index 47966aee0..1fa5a243c 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
@@ -2,13 +2,15 @@ package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.player.PlayerQuitEvent;
-class EssentialsXMPPPlayerListener extends PlayerListener
+class EssentialsXMPPPlayerListener implements Listener
{
private final transient IEssentials ess;
@@ -18,21 +20,21 @@ class EssentialsXMPPPlayerListener extends PlayerListener
this.ess = ess;
}
- @Override
+ @EventHandler(priority= EventPriority.MONITOR)
public void onPlayerJoin(final PlayerJoinEvent event)
{
final User user = ess.getUser(event.getPlayer());
sendMessageToSpyUsers("Player " + user.getDisplayName() + " joined the game");
}
- @Override
+ @EventHandler(priority= EventPriority.MONITOR)
public void onPlayerChat(final PlayerChatEvent event)
{
final User user = ess.getUser(event.getPlayer());
sendMessageToSpyUsers(String.format(event.getFormat(), user.getDisplayName(), event.getMessage()));
}
- @Override
+ @EventHandler(priority= EventPriority.MONITOR)
public void onPlayerQuit(final PlayerQuitEvent event)
{
final User user = ess.getUser(event.getPlayer());