[Resolve merge conflicts

2020-09-19 14:19:40 +02:00 · 2020-09-19 14:19:40 +02:00 · 443310b1c4
commit 443310b1c4
parent a3923a825e a3c34f5f39
22 changed files with 76 additions and 129 deletions
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@ -87,6 +87,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, _BASE_SESSION_CLASS):
            super().dataReceived(data)
        except ValueError as err:
            from evennia.utils import logger
+
            logger.log_err(f"Malformed telnet input: {err}")

    def connectionMade(self):