Fix npe if acidclient has a null nspass

diff --git a/acid/src/main/java/net/rizon/acid/core/Acidictive.java b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
index a2569d627c56519a8f2df7edd18ab41ed20cb6ee..b6069b255b197367402679e9be5d955ac9f23a09 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Acidictive.java
+++ b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
@@ -1,5 +1,12 @@
 package net.rizon.acid.core;
 
+import net.rizon.acid.conf.Client;
+import net.rizon.acid.conf.Config;
+import net.rizon.acid.sql.SQL;
+import net.rizon.acid.util.Blowfish;
+import net.rizon.acid.util.ClassLoader;
+import net.rizon.acid.util.Util;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -15,13 +22,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.logging.Level;
 
-import net.rizon.acid.conf.Client;
-import net.rizon.acid.conf.Config;
-import net.rizon.acid.sql.SQL;
-import net.rizon.acid.util.Blowfish;
-import net.rizon.acid.util.ClassLoader;
-import net.rizon.acid.util.Util;
-
 public class Acidictive extends AcidCore
 {
        private static final Logger log = Logger.getLogger(Acidictive.class.getName());
@@ -394,7 +394,7 @@ public class Acidictive extends AcidCore
                if (creator.equalsIgnoreCase("nickserv") && msg.matches("^.*registered\\s+and\\s+protected.*$"))
                {
                        AcidUser au = (AcidUser) User.findUser(recipient);
-                       if (au != null && !au.getNSPass().isEmpty())
+                       if (au != null && au.getNSPass() != null && !au.getNSPass().isEmpty())
                                Protocol.privmsg(recipient, creator, "IDENTIFY " + au.getNSPass());
                        return;
                }