summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-11-25 13:55:09 +0100
committersnowleo <schneeleo@gmail.com>2011-11-25 13:55:09 +0100
commit223028f306b0021f83de38d8a0770fdc82579d8c (patch)
treea9aeee9879b5e494771af65747d6fb6c9a77d751
parent7afbad3218e99509ca8fec653c4fcef41949ed0e (diff)
downloadEssentials-223028f306b0021f83de38d8a0770fdc82579d8c.tar
Essentials-223028f306b0021f83de38d8a0770fdc82579d8c.tar.gz
Essentials-223028f306b0021f83de38d8a0770fdc82579d8c.tar.lz
Essentials-223028f306b0021f83de38d8a0770fdc82579d8c.tar.xz
Essentials-223028f306b0021f83de38d8a0770fdc82579d8c.zip
Fix another NPE in AlternativeCommandsHandler
-rw-r--r--Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
index 583401a55..5fc2e23de 100644
--- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
@@ -42,7 +42,11 @@ public class AlternativeCommandsHandler
PluginCommand reg = ess.getServer().getPluginCommand(pluginName + ":" + pc.getName().toLowerCase(Locale.ENGLISH));
if (reg == null)
{
- reg = Bukkit.getServer().getPluginCommand(pc.getName().toLowerCase(Locale.ENGLISH));
+ reg = ess.getServer().getPluginCommand(pc.getName().toLowerCase(Locale.ENGLISH));
+ }
+ if (reg == null)
+ {
+ continue;
}
for (String label : labels)
{