Merge pull request #179 from attilamolnar/insp20+desyncfix

[2.0] Fix desyncs caused by m_autoop and broken spanningtree routing logic
This commit is contained in:
Robin Burchell 2012-06-01 01:07:36 -07:00
commit 3af9c3f895
2 changed files with 8 additions and 8 deletions

View File

@ -119,7 +119,7 @@ public:
for(std::string::size_type i = modeline.length(); i > 1; --i) // we use "i > 1" instead of "i" so we skip the +
modechange.push_back(memb->user->nick);
if(modechange.size() >= 3)
ServerInstance->SendMode(modechange,ServerInstance->FakeClient);
ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient);
}
}

View File

@ -52,15 +52,15 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
if (routing.type == ROUTE_TYPE_LOCALONLY)
{
Module* srcmodule = thiscmd->creator;
Version ver = srcmodule->GetVersion();
/* Broadcast when it's a core command with the default route descriptor and the source is a
* remote user or a remote server
*/
if ((ver.Flags & VF_CORE) && !IS_LOCAL(user))
routing = ROUTE_BROADCAST;
else
return;
if (IS_SERVER(user) && user != ServerInstance->FakeClient)
Version ver = thiscmd->creator->GetVersion();
if ((!(ver.Flags & VF_CORE)) || (IS_LOCAL(user)) || (IS_SERVER(user) == ServerInstance->FakeClient))
return;
routing = ROUTE_BROADCAST;
}
else if (routing.type == ROUTE_TYPE_OPT_BCAST)
{