Unset all known status modes when we recieve a ts older than ours, and remove split servers from their uplinks

1 files changed, 13 insertions, 7 deletions

diff --git a/src/protocol/bahamut.cpp b/src/protocol/bahamut.cpp
index dc2790ac5..685dd52cd 100644
--- a/src/protocol/bahamut.cpp
+++ b/src/protocol/bahamut.cpp
@@ -322,15 +322,21 @@ int anope_event_sjoin(const char *source, int ac, const char **av)
 		c->creation_time = ts;
 
 		/* Remove status from all of our users */
-		for (CUserList::iterator it = c->users.begin(); it != c->users.end(); ++it)
+		for (std::list<Mode *>::const_iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
 		{
-			UserContainer *uc = *it;
+			Mode *m = *it;
 
-			c->RemoveMode(NULL, CMODE_OWNER, uc->user->nick);
-			c->RemoveMode(NULL, CMODE_PROTECT, uc->user->nick);
-			c->RemoveMode(NULL, CMODE_OP, uc->user->nick);
-			c->RemoveMode(NULL, CMODE_HALFOP, uc->user->nick);
-			c->RemoveMode(NULL, CMODE_VOICE, uc->user->nick);
+			if (m->Type != MODE_STATUS)
+				continue;
+
+			ChannelMode *cm = dynamic_cast<ChannelMode *>(m);
+
+			for (CUserList::const_iterator uit = c->users.begin(), uit_end = c->users.end(); uit != uit_end; ++uit)
+			{
+				UserContainer *uc = *uit;
+
+				c->RemoveMode(NULL, cm, uc->user->nick);
+			}
 		}
 		if (c->ci)
 		{