From c2a97d9f3f2d56d889875f9b60d1e2cbc9826d15 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 15 Aug 2010 14:08:05 -0400 Subject: Cleanup of various different crashes/inconsistancies --- modules/protocol/bahamut.cpp | 10 ++-------- modules/protocol/inspircd11.cpp | 10 ++-------- modules/protocol/inspircd12.cpp | 10 ++-------- modules/protocol/inspircd20.cpp | 8 +------- modules/protocol/ratbox.cpp | 10 ++-------- modules/protocol/unreal32.cpp | 10 ++-------- 6 files changed, 11 insertions(+), 47 deletions(-) (limited to 'modules/protocol') diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index d71e88dd3..72b57ce4c 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -398,7 +398,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(ch); if (!cm) { - Alog() << "Recieved unknown mode prefix " << buf[0] << " in SJOIN string"; + Alog() << "Receeved unknown mode prefix " << buf[0] << " in SJOIN string"; continue; } @@ -443,13 +443,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) { /* Unset the syncing flag */ c->UnsetFlag(CH_SYNCING); - - /* If there are users in the channel they are allowed to be, set topic mlock etc. */ - if (!c->users.empty()) - c->Sync(); - /* If there are no users in the channel, there is a ChanServ timer set to part the service bot - * and destroy the channel soon - */ + c->Sync(); } return MOD_CONT; diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp index c13ee1120..c5a4c79f7 100644 --- a/modules/protocol/inspircd11.cpp +++ b/modules/protocol/inspircd11.cpp @@ -450,7 +450,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) if (!cm) { - Alog() << "Recieved unknown mode prefix " << buf[0] << " in FJOIN string"; + Alog() << "Received unknown mode prefix " << buf[0] << " in FJOIN string"; buf.erase(buf.begin()); continue; } @@ -496,13 +496,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) { /* Unset the syncing flag */ c->UnsetFlag(CH_SYNCING); - - /* If there are users in the channel they are allowed to be, set topic mlock etc. */ - if (!c->users.empty()) - c->Sync(); - /* If there are no users in the channel, there is a ChanServ timer set to part the service bot - * and destroy the channel soon - */ + c->Sync(); } return MOD_CONT; diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 61d51ed9a..cd628b005 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -496,7 +496,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(buf[0]); if (!cm) { - Alog() << "Recieved unknown mode prefix " << buf[0] << " in FJOIN string"; + Alog() << "Receeved unknown mode prefix " << buf[0] << " in FJOIN string"; buf.erase(buf.begin()); continue; } @@ -543,13 +543,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) { /* Unset the syncing flag */ c->UnsetFlag(CH_SYNCING); - - /* If there are users in the channel they are allowed to be, set topic mlock etc */ - if (!c->users.empty()) - c->Sync(); - /* If there are no users in the channel, there is a ChanServ timer set to part the service bot - * and destroy the channel soon - */ + c->Sync(); } return MOD_CONT; diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 69e648193..dfea02246 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -541,13 +541,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) { /* Unset the syncing flag */ c->UnsetFlag(CH_SYNCING); - - /* If there are users in the channel they are allowed to be, set topic mlock etc */ - if (!c->users.empty()) - c->Sync(); - /* If there are no users in the channel, there is a ChanServ timer set to part the service bot - * and destroy the channel soon - */ + c->Sync(); } return MOD_CONT; diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index 623d5a31e..ff2a0f6c6 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -352,7 +352,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(ch); if (!cm) { - Alog() << "Recieved unknown mode prefix " << buf[0] << " in SJOIN string"; + Alog() << "Received unknown mode prefix " << buf[0] << " in SJOIN string"; continue; } @@ -396,13 +396,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) { /* Unset the syncing flag */ c->UnsetFlag(CH_SYNCING); - - /* If there are users in the channel they are allowed to be, set topic mlock etc. */ - if (!c->users.empty()) - c->Sync(); - /* If there are no users in the channel, there is a ChanServ timer set to part the service bot - * and destroy the channel soon - */ + c->Sync(); } return MOD_CONT; diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp index 064efdaa7..16fc8582e 100644 --- a/modules/protocol/unreal32.cpp +++ b/modules/protocol/unreal32.cpp @@ -1084,7 +1084,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(ch); if (!cm) { - Alog() << "Recieved unknown mode prefix " << buf[0] << " in SJOIN string"; + Alog() << "Received unknown mode prefix " << buf[0] << " in SJOIN string"; continue; } @@ -1129,13 +1129,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) { /* Unset the syncing flag */ c->UnsetFlag(CH_SYNCING); - - /* If there are users in the channel they are allowed to be, set topic mlock etc. */ - if (!c->users.empty()) - c->Sync(); - /* If there are no users in the channel, there is a ChanServ timer set to part the service bot - * and destroy the channel soon - */ + c->Sync(); } return MOD_CONT; -- cgit