diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-09-14 00:59:25 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-09-14 00:59:25 +0100 |
| commit | 18e315a04867af60bf3a15680a4ef707a94f5719 (patch) | |
| tree | c9081278b625a9aa8d2c9d7e72b77db90ff38b9e | |
| parent | d3967297bb4d0cda4e9a1f080faa62966adbc176 (diff) | |
| parent | ea3631ddc27d95dbd6925d3b5c961ac746a4bfa7 (diff) | |
| download | Essentials-18e315a04867af60bf3a15680a4ef707a94f5719.tar Essentials-18e315a04867af60bf3a15680a4ef707a94f5719.tar.gz Essentials-18e315a04867af60bf3a15680a4ef707a94f5719.tar.lz Essentials-18e315a04867af60bf3a15680a4ef707a94f5719.tar.xz Essentials-18e315a04867af60bf3a15680a4ef707a94f5719.zip | |
Merge branch '2.9' of github.com:essentials/Essentials into 2.9
| -rw-r--r-- | EssentialsXMPP/nbproject/project.properties | 5 | ||||
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java | 14 | ||||
| -rw-r--r-- | lib/smack-3.2.2.jar | bin | 0 -> 309784 bytes |
3 files changed, 15 insertions, 4 deletions
diff --git a/EssentialsXMPP/nbproject/project.properties b/EssentialsXMPP/nbproject/project.properties index 66d780451..ace5022d0 100644 --- a/EssentialsXMPP/nbproject/project.properties +++ b/EssentialsXMPP/nbproject/project.properties @@ -1,5 +1,6 @@ annotation.processing.enabled=true annotation.processing.enabled.in.editor=false +annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=EssentialsXMPP @@ -64,14 +65,14 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= file.reference.bukkit.jar=../lib/bukkit.jar -file.reference.smack-3.2.1.jar=../lib/smack-3.2.1.jar +file.reference.smack-3.2.2.jar=../lib/smack-3.2.2.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=true jar.index=${jnlp.enabled} javac.classpath=\ ${reference.Essentials.jar}:\ - ${file.reference.smack-3.2.1.jar}:\ + ${file.reference.smack-3.2.2.jar}:\ ${file.reference.bukkit.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java index 17827c3c7..c0913e6a9 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java @@ -3,6 +3,7 @@ package com.earth2me.essentials.xmpp; import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import java.util.List; +import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -49,9 +50,18 @@ class EssentialsXMPPPlayerListener implements Listener List<String> users = EssentialsXMPP.getInstance().getSpyUsers(); synchronized (users) { - for (String address : users) + for (final String address : users) { - EssentialsXMPP.getInstance().sendMessage(address, message); + Bukkit.getScheduler().scheduleSyncDelayedTask(ess, new Runnable() + { + @Override + public void run() + { + EssentialsXMPP.getInstance().sendMessage(address, message); + } + + }); + } } } diff --git a/lib/smack-3.2.2.jar b/lib/smack-3.2.2.jar Binary files differnew file mode 100644 index 000000000..f9cb4da95 --- /dev/null +++ b/lib/smack-3.2.2.jar |