diff options
author | snowleo <schneeleo@gmail.com> | 2012-01-24 00:52:08 +0100 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2012-01-24 00:52:08 +0100 |
commit | cc0e9aa84bc41e341f04202f1f0d2f3c402cf3f4 (patch) | |
tree | a7cbcd229b4a5c3dee2731b95b3ddc1ccd95df4c /EssentialsXMPP/src/com | |
parent | 6af054631fe04ef7a607f24e459e37836c568100 (diff) | |
parent | f93769dd1dd11ef30c77dd6c9e0e5cf275052715 (diff) | |
download | Essentials-cc0e9aa84bc41e341f04202f1f0d2f3c402cf3f4.tar Essentials-cc0e9aa84bc41e341f04202f1f0d2f3c402cf3f4.tar.gz Essentials-cc0e9aa84bc41e341f04202f1f0d2f3c402cf3f4.tar.lz Essentials-cc0e9aa84bc41e341f04202f1f0d2f3c402cf3f4.tar.xz Essentials-cc0e9aa84bc41e341f04202f1f0d2f3c402cf3f4.zip |
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
Diffstat (limited to 'EssentialsXMPP/src/com')
-rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java | 8 | ||||
-rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java index cf7fb1814..01e1ce131 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java @@ -12,8 +12,6 @@ import java.util.logging.Logger; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.event.Event.Priority; -import org.bukkit.event.Event.Type; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -50,9 +48,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); @@ -61,8 +57,6 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP ess.addReloadListener(xmpp); commandHandler = new EssentialsCommandHandler(EssentialsXMPP.class.getClassLoader(), "com.earth2me.essentials.xmpp.Command", "essentials.", ess); - - LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team")); } @Override diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java index 1bf672515..b6daf8114 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.api.IEssentials; import com.earth2me.essentials.api.IUser; +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 IUser user = ess.getUser(event.getPlayer()); sendMessageToSpyUsers("Player " + user.getDisplayName() + " joined the game"); } - @Override + @EventHandler(priority= EventPriority.MONITOR) public void onPlayerChat(final PlayerChatEvent event) { final IUser 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 IUser user = ess.getUser(event.getPlayer()); |