summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-11-25 00:22:57 +0100
committersnowleo <schneeleo@gmail.com>2011-11-25 00:22:57 +0100
commit31b9e792bda348b9eb815ef5237b290ba195fb0b (patch)
tree1318cba58fd02ed946a013fc0cd5e1df663d2717
parent32e43bf1673fa2aa50891aa5b830fdd75cee534b (diff)
downloadEssentials-31b9e792bda348b9eb815ef5237b290ba195fb0b.tar
Essentials-31b9e792bda348b9eb815ef5237b290ba195fb0b.tar.gz
Essentials-31b9e792bda348b9eb815ef5237b290ba195fb0b.tar.lz
Essentials-31b9e792bda348b9eb815ef5237b290ba195fb0b.tar.xz
Essentials-31b9e792bda348b9eb815ef5237b290ba195fb0b.zip
Fix NPE in AlternativeCommandsHandler on shutdown
-rw-r--r--Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
index 257d9a165..583401a55 100644
--- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
@@ -78,7 +78,7 @@ public class AlternativeCommandsHandler
while (pcIterator.hasNext())
{
final PluginCommand pc = pcIterator.next();
- if (pc.getPlugin().equals(plugin))
+ if (pc.getPlugin() == null || pc.getPlugin().equals(plugin))
{
pcIterator.remove();
}