summaryrefslogtreecommitdiff
path: root/modules/commands
diff options
context:
space:
mode:
Diffstat (limited to 'modules/commands')
-rw-r--r--modules/commands/os_dns.cpp2
-rw-r--r--modules/commands/os_jupe.cpp3
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);