From b0daafe00ee8ac531dced9060483865d4b339c64 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Fri, 28 Mar 2003 03:10:22 +0000
Subject: [PATCH] *Really* fixed now.

---
 plugins/NickServ.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/NickServ.py b/plugins/NickServ.py
index 1ad635f0b..80b0fb774 100644
--- a/plugins/NickServ.py
+++ b/plugins/NickServ.py
@@ -62,10 +62,11 @@ class NickServ(privmsgs.CapabilityCheckingPrivmsg):
                                                                 needed=2, 
                                                                 optional=1)
         self.nickserv = nickserv or 'NickServ'
+        self.sentGhost = False
         self._ghosted = re.compile('%s.*killed' % self.nick)
         irc.reply(msg, conf.replySuccess)
 
-    _owned = re.compile('nick.*(?:(?<!not)(?:registered|protected|owned))')
+    _owned = re.compile('nick.*(?<!not)(?:registered|protected|owned)')
     def doNotice(self, irc, msg):
         if self.nickserv:
             if msg.nick == self.nickserv:
@@ -73,6 +74,8 @@ class NickServ(privmsgs.CapabilityCheckingPrivmsg):
                     # NickServ told us the nick is registered.
                     identify = 'IDENTIFY %s' % self.password
                     irc.queueMsg(ircmsgs.privmsg(self.nickserv, identify))
+                elif msg.args[1].find('recognized') != -1:
+                    self.sentGhost = False
                 elif self._ghosted.search(msg.args[1]):
                     # NickServ told us the nick has been ghost-killed.
                     irc.queueMsg(ircmsgs.nick(self.nick))
@@ -80,10 +83,12 @@ class NickServ(privmsgs.CapabilityCheckingPrivmsg):
     def __call__(self, irc, msg):
         callbacks.Privmsg.__call__(self, irc, msg)
         if self.nickserv:
-            if irc.nick != self.nick:
+            if irc.nick != self.nick and not self.sentGhost:
                 ghost = 'GHOST %s %s' % (self.nick, self.password)
                 irc.queueMsg(ircmsgs.privmsg(self.nickserv, ghost))
+                self.sentGhost = True
 
 
 Class = NickServ
+
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: