From 651585f1912ee30d8940243186dbacac518458f8 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Tue, 31 Jul 2018 03:24:44 +0200 Subject: [PATCH] Fixed a bug where shownames would always be forbidden. --- server/aoprotocol.py | 3 +-- server/area_manager.py | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/aoprotocol.py b/server/aoprotocol.py index e0c35e8..d21a6a5 100644 --- a/server/aoprotocol.py +++ b/server/aoprotocol.py @@ -347,12 +347,11 @@ class AOProtocol(asyncio.Protocol): self.ArgType.INT, self.ArgType.INT, self.ArgType.INT, self.ArgType.INT, self.ArgType.INT, self.ArgType.INT, self.ArgType.INT, self.ArgType.STR): msg_type, pre, folder, anim, text, pos, sfx, anim_type, cid, sfx_delay, button, evidence, flip, ding, color, showname = args - if len(showname) > 0 and not self.client.area.showname_changes_allowed == "true": + if len(showname) > 0 and not self.client.area.showname_changes_allowed: self.client.send_host_message("Showname changes are forbidden in this area!") return else: return - msg_type, pre, folder, anim, text, pos, sfx, anim_type, cid, sfx_delay, button, evidence, flip, ding, color = args if self.client.area.is_iniswap(self.client, pre, anim, folder) and folder != self.client.get_char_name(): self.client.send_host_message("Iniswap is blocked in this area") return diff --git a/server/area_manager.py b/server/area_manager.py index 6b6c939..3ed543d 100644 --- a/server/area_manager.py +++ b/server/area_manager.py @@ -49,6 +49,8 @@ class AreaManager: self.recorded_messages = [] self.evidence_mod = evidence_mod self.locking_allowed = locking_allowed + self.showname_changes_allowed = showname_changes_allowed + self.shouts_allowed = shouts_allowed self.owned = False self.cards = dict()