Move some local-only fields to LocalUser

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index 0e45de33fc1c7c2b9803bd7f58e8a430aefee1c5..d7f8f372e47b1645742027286aa4b5bee4d2bcf4 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -135,6 +135,22 @@ void Channel::DelUser(User* user)
                delete a->second;
                userlist.erase(a);
        }
+
+       if (userlist.empty())
+       {
+               ModResult res;
+               FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
+               if (res == MOD_RES_DENY)
+                       return;
+               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
+               /* kill the record */
+               if (iter != ServerInstance->chanlist->end())
+               {
+                       FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
+                       ServerInstance->chanlist->erase(iter);
+               }
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
 }
 
 bool Channel::HasUser(User* user)
@@ -466,21 +482,6 @@ void Channel::PartUser(User *user, std::string &reason)
        }
 
        this->DelUser(user);
-       if (userlist.empty())
-       {
-               ModResult res;
-               FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
-               if (res == MOD_RES_DENY)
-                       return;
-               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-               /* kill the record */
-               if (iter != ServerInstance->chanlist->end())
-               {
-                       FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-                       ServerInstance->chanlist->erase(iter);
-               }
-               ServerInstance->GlobalCulls.AddItem(this);
-       }
 }
 
 void Channel::ServerKickUser(User* user, const char* reason, const std::string& servername)
@@ -545,21 +546,6 @@ void Channel::KickUser(User *src, User *user, const char* reason)
        }
 
        this->DelUser(user);
-       if (userlist.empty())
-       {
-               ModResult res;
-               FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
-               if (res == MOD_RES_DENY)
-                       return;
-               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-               /* kill the record */
-               if (iter != ServerInstance->chanlist->end())
-               {
-                       FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-                       ServerInstance->chanlist->erase(iter);
-               }
-               ServerInstance->GlobalCulls.AddItem(this);
-       }
 }
 
 void Channel::WriteChannel(User* user, const char* text, ...)