summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-06-07 01:08:31 +0200
committersnowleo <schneeleo@gmail.com>2011-06-07 01:08:31 +0200
commitd8a81923b1bd3f42add1fd096604a3b2ef2506d5 (patch)
tree30eb52ebb75a5a2025bd82bbed8931e0b53300f4
parent1321f8de5d400ad7ff6acd6dbc9bb78303439baa (diff)
downloadEssentials-d8a81923b1bd3f42add1fd096604a3b2ef2506d5.tar
Essentials-d8a81923b1bd3f42add1fd096604a3b2ef2506d5.tar.gz
Essentials-d8a81923b1bd3f42add1fd096604a3b2ef2506d5.tar.lz
Essentials-d8a81923b1bd3f42add1fd096604a3b2ef2506d5.tar.xz
Essentials-d8a81923b1bd3f42add1fd096604a3b2ef2506d5.zip
Only import what we really need.
-rw-r--r--EssentialsChat/nbproject/project.properties8
-rw-r--r--EssentialsGeoIP/nbproject/project.properties4
-rw-r--r--EssentialsSpawn/nbproject/project.properties5
-rw-r--r--EssentialsXMPP/nbproject/project.properties4
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java12
5 files changed, 17 insertions, 16 deletions
diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties
index 89b368bee..08df72abc 100644
--- a/EssentialsChat/nbproject/project.properties
+++ b/EssentialsChat/nbproject/project.properties
@@ -26,14 +26,12 @@ dist.jar=${dist.dir}/EssentialsChat.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=../lib/craftbukkit-0.0.1-SNAPSHOT.jar
-file.reference.Permissions.jar=..\\lib\\Permissions.jar
+file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
includes=**
jar.compress=false
javac.classpath=\
- ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
- ${file.reference.Permissions.jar}:\
- ${reference.Essentials.jar}
+ ${reference.Essentials.jar}:\
+ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
diff --git a/EssentialsGeoIP/nbproject/project.properties b/EssentialsGeoIP/nbproject/project.properties
index bc9576f9a..8eb099985 100644
--- a/EssentialsGeoIP/nbproject/project.properties
+++ b/EssentialsGeoIP/nbproject/project.properties
@@ -26,12 +26,12 @@ dist.jar=${dist.dir}/EssentialsGeoIP.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=../lib/craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
includes=**
jar.compress=false
javac.classpath=\
${reference.Essentials.jar}:\
- ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
+ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
diff --git a/EssentialsSpawn/nbproject/project.properties b/EssentialsSpawn/nbproject/project.properties
index 3b7354449..524c40357 100644
--- a/EssentialsSpawn/nbproject/project.properties
+++ b/EssentialsSpawn/nbproject/project.properties
@@ -26,12 +26,12 @@ dist.jar=${dist.dir}/EssentialsSpawn.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
includes=**
jar.compress=false
javac.classpath=\
${reference.Essentials.jar}:\
- ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
+ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -58,6 +58,7 @@ javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
platform.active=default_platform
project.Essentials=../Essentials
reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
diff --git a/EssentialsXMPP/nbproject/project.properties b/EssentialsXMPP/nbproject/project.properties
index da4e2968b..6c1b475e6 100644
--- a/EssentialsXMPP/nbproject/project.properties
+++ b/EssentialsXMPP/nbproject/project.properties
@@ -26,13 +26,13 @@ dist.jar=${dist.dir}/original-EssentialsXMPP.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=../lib/craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
file.reference.smack-3.2.0.jar=../lib/smack-3.2.0.jar
includes=**
jar.compress=false
javac.classpath=\
- ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
${reference.Essentials.jar}:\
+ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
${file.reference.smack-3.2.0.jar}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchecked
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
index d057f5ddf..537a32a5e 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
@@ -1,5 +1,6 @@
package com.earth2me.essentials.xmpp;
+import com.earth2me.essentials.Console;
import com.earth2me.essentials.EssentialsConf;
import com.earth2me.essentials.IConf;
import java.io.File;
@@ -12,8 +13,6 @@ import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import org.jivesoftware.smack.Chat;
@@ -271,10 +270,13 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
{
if (config.getStringList("op-users", new ArrayList<String>()).contains(StringUtils.parseBareAddress(chat.getParticipant())))
{
- final CraftServer craftServer = (CraftServer)parent.getServer();
- if (craftServer != null)
+ try
+ {
+ parent.getServer().dispatchCommand(Console.getCommandSender(parent.getServer()), message.substring(1));
+ }
+ catch (Exception ex)
{
- craftServer.dispatchCommand(new ConsoleCommandSender(craftServer), message.substring(1));
+ LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
}
}
}