aboutsummaryrefslogtreecommitdiff
path: root/server/aoprotocol.py
diff options
context:
space:
mode:
authorCerapter <cerap@protonmail.com>2018-09-15 01:16:28 +0200
committerCerapter <cerap@protonmail.com>2018-09-15 01:16:28 +0200
commit8006d40d1495a848b07a59bf514100648c82459c (patch)
tree30a997380472cc82155ee342de68a85768c23d20 /server/aoprotocol.py
parentb33d0b0a3c9311fc43d5d00d56d7b6c8d706adcd (diff)
Fixed bugs regarding noninterrupting pres.
- They are now actually non-interrupting when an interjection is played. - Realisation now happens at the start of the message if the pre is non-interrupting.
Diffstat (limited to 'server/aoprotocol.py')
-rw-r--r--server/aoprotocol.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/server/aoprotocol.py b/server/aoprotocol.py
index 44b46122..47126562 100644
--- a/server/aoprotocol.py
+++ b/server/aoprotocol.py
@@ -418,6 +418,12 @@ class AOProtocol(asyncio.Protocol):
if len(showname) > 15:
self.client.send_host_message("Your IC showname is way too long!")
return
+ if nonint_pre != '':
+ if button in (1, 2, 3, 4, 23):
+ if anim_type == 1 or anim_type == 2:
+ anim_type = 0
+ elif anim_type == 6:
+ anim_type = 5
if self.client.area.non_int_pres_only:
if anim_type == 1 or anim_type == 2:
anim_type = 0