From e6e61aa5e6282f75ce688d9830da688e4a225fc1 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 13 Sep 2016 12:31:47 +0200 Subject: [PATCH] Minor tweaks to fix a portal traceback during handshake. --- evennia/server/portal/mxp.py | 2 +- evennia/server/portal/telnet.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/server/portal/mxp.py b/evennia/server/portal/mxp.py index 5f10f1d5c7..0d7efefd34 100644 --- a/evennia/server/portal/mxp.py +++ b/evennia/server/portal/mxp.py @@ -82,5 +82,5 @@ class Mxp(object): """ self.protocol.protocol_flags["MXP"] = True - self.protocol.handshake_done() self.protocol.requestNegotiation(MXP, '') + self.protocol.handshake_done() diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py index 447b24dff4..db4f804afb 100644 --- a/evennia/server/portal/telnet.py +++ b/evennia/server/portal/telnet.py @@ -68,7 +68,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session): # timeout the handshakes in case the client doesn't reply at all from evennia.utils.utils import delay - delay(2, callback=self.handshake_done, retval=True) + delay(2, callback=self.handshake_done, force=True) # TCP/IP keepalive watches for dead links self.transport.setTcpKeepAlive(1)