diff options
| author | Adam <Adam@anope.org> | 2013-07-26 21:40:16 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-07-26 21:40:16 -0400 |
| commit | fde83f6564c38635c7bfebd7edb60f30b012189c (patch) | |
| tree | f4a56f82280ecb1f3ed3291b44c6afda72a0fce2 /modules/commands | |
| parent | f0f43cf4264c68d638cd5920877d088c6c278435 (diff) | |
Rethink jupe/squit thing somewhat. Workaround for the inspircd rsquit/squit mess
Diffstat (limited to 'modules/commands')
| -rw-r--r-- | modules/commands/os_dns.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/os_jupe.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/commands/os_dns.cpp b/modules/commands/os_dns.cpp index 0590bd704..c71b1f887 100644 --- a/modules/commands/os_dns.cpp +++ b/modules/commands/os_dns.cpp @@ -686,7 +686,7 @@ class ModuleDNS : public Module void OnNewServer(Server *s) anope_override { - if (Me == NULL || s == Me || s->IsJuped()) + if (s == Me || s->IsJuped()) return; if (!Me->IsSynced() || this->readd_connected_servers) { diff --git a/modules/commands/os_jupe.cpp b/modules/commands/os_jupe.cpp index 429c5e998..de6fa76f4 100644 --- a/modules/commands/os_jupe.cpp +++ b/modules/commands/os_jupe.cpp @@ -36,7 +36,10 @@ class CommandOSJupe : public Command /* Generate the new sid before quitting the old server, so they can't collide */ Anope::string sid = Servers::TS6_SID_Retrieve(); if (server) + { IRCD->SendSquit(server, rbuf); + server->Delete(rbuf); + } Server *juped_server = new Server(Me, jserver, 1, rbuf, sid, true); IRCD->SendServer(juped_server); |