Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1525 from TehomCD/fix_at_say_msg_receivers

Browse source 
Fix msg_receivers to be used
This commit is contained in:
Griatch 2017-12-08 19:04:11 +01:00 • committed by GitHub
commit 80e7a28e4f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/objects/objects.py
View file

@ -1624,7 +1624,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
# whisper mode # whisper mode
msg_type = 'whisper' msg_type = 'whisper'
msg_self = '{self} whisper to {all_receivers}, "{speech}"' if msg_self is True else msg_self msg_self = '{self} whisper to {all_receivers}, "{speech}"' if msg_self is True else msg_self
msg_receivers = '{object} whispers: "{speech}"' msg_receivers = msg_receivers or '{object} whispers: "{speech}"'
msg_location = None msg_location = None
else: else:
msg_self = '{self} say, "{speech}"' if msg_self is True else msg_self msg_self = '{self} say, "{speech}"' if msg_self is True else msg_self
@ -1669,7 +1669,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
location_mapping = {"self": "You", location_mapping = {"self": "You",
"object": self, "object": self,
"location": location, "location": location,
"all_receivers": ", ".join(recv for recv in receivers) if receivers else None, "all_receivers": ", ".join(str(recv) for recv in receivers) if receivers else None,
"receiver": None, "receiver": None,
"speech": message} "speech": message}
location_mapping.update(custom_mapping) location_mapping.update(custom_mapping)