From a74fd55c7be972f323b8721c490fd8f4261e13c1 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 30 Jan 2018 18:22:24 +0100 Subject: [PATCH] Make FORCEDENDLINE default for clients we don't know for sure don't want a cr+nl at the end of the telnet line --- evennia/server/portal/ttype.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py index b07384ab2..d143b6974 100644 --- a/evennia/server/portal/ttype.py +++ b/evennia/server/portal/ttype.py @@ -100,10 +100,6 @@ class Ttype(object): # just start the request chain self.protocol.requestNegotiation(TTYPE, SEND) - # for clients that support TTYPE we assume this is not needed - # (they can set it manually if so) - self.protocol.protocol_flags["FORCEDENDLINE"] = False - elif self.ttype_step == 1: # this is supposed to be the name of the client/terminal. # For clients not supporting the extended TTYPE @@ -117,10 +113,10 @@ class Ttype(object): if cupper.startswith("MUDLET"): # supports xterm256 stably since 1.1 (2010?) xterm256 = cupper.split("MUDLET", 1)[1].strip() >= "1.1" + self.protocol.protocol_flags["FORCEDENDLINE"] = False - if cupper.startswith("TINYFUGUE"): - # tinyfugue expects _GA + endline - self.protocol.protocol_flags["FORCEDENDLINE"] = True + if cupper.startswith("TINTIN++"): + self.protocol.protocol_flags["FORCEDENDLINE"] = False if (cupper.startswith("XTERM") or cupper.endswith("-256COLOR") or