From 359842d554424946c2cae87bc240cf92c5a318fa Mon Sep 17 00:00:00 2001 From: Ben Longden Date: Wed, 21 Apr 2021 18:17:19 +0100 Subject: [PATCH] Mudlet likes GA's for prompts Don't sent GA on every message (not everything is a prompt) Do enforce line endings for mudlet, it wont display anything without it. --- evennia/server/portal/telnet.py | 5 ++--- evennia/server/portal/ttype.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py index 821e96aa24..8e5c4baf96 100644 --- a/evennia/server/portal/telnet.py +++ b/evennia/server/portal/telnet.py @@ -337,8 +337,6 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session): line = line.replace(b"\n", b"\r\n") if not line.endswith(b"\r\n") and self.protocol_flags.get("FORCEDENDLINE", True): line += b"\r\n" - if not self.protocol_flags.get("NOGOAHEAD", True): - line += IAC + GA return self.transport.write(mccp_compress(self, line)) # Session hooks @@ -440,7 +438,8 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session): prompt = mxp_parse(prompt) prompt = to_bytes(prompt, self) prompt = prompt.replace(IAC, IAC + IAC).replace(b"\n", b"\r\n") - prompt += IAC + GA + if not self.protocol_flags.get("NOGOAHEAD", True): + prompt += IAC + GA self.transport.write(mccp_compress(self, prompt)) else: if echo is not None: diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py index 01e7ebf74a..0b0683b637 100644 --- a/evennia/server/portal/ttype.py +++ b/evennia/server/portal/ttype.py @@ -119,7 +119,7 @@ class Ttype(object): if clientname.startswith("MUDLET"): # supports xterm256 stably since 1.1 (2010?) xterm256 = clientname.split("MUDLET", 1)[1].strip() >= "1.1" - self.protocol.protocol_flags["FORCEDENDLINE"] = False + self.protocol.protocol_flags["FORCEDENDLINE"] = True if clientname.startswith("TINTIN++"): self.protocol.protocol_flags["FORCEDENDLINE"] = True