From 44743d860e52fe8d8e35b67a9d6f39f580a67ee0 Mon Sep 17 00:00:00 2001
From: James Lu <GLolol@overdrivenetworks.com>
Date: Mon, 7 Nov 2016 21:52:17 -0800
Subject: [PATCH] relay: don't break autoconnect anymore when there's a server
 conflict

This reverts most of commits 5c7524b and f2a5e1d.
---
 plugins/relay.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugins/relay.py b/plugins/relay.py
index 52d3468..13c1183 100644
--- a/plugins/relay.py
+++ b/plugins/relay.py
@@ -7,7 +7,6 @@ from collections import defaultdict
 
 from pylinkirc import utils, world, conf
 from pylinkirc.log import log
-from pylinkirc.coremods import control
 from pylinkirc.coremods import permissions
 
 ### GLOBAL (statekeeping) VARIABLES
@@ -274,10 +273,7 @@ def spawnRelayServer(irc, remoteirc):
         log.exception('(%s) Failed to spawn server for %r (possible jupe?):',
                       irc.name, remoteirc.name)
         # We will just bail here. Disconnect the bad network.
-        try:
-            control.remove_network(irc)
-        except KeyError:
-            pass
+        irc.disconnect()
         return
 
     # Mark the server as a relay server