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

Remove limit on whispering to oneself.

Browse source 
Resolves #1416.
This commit is contained in:
Griatch 2017-09-03 10:31:45 +02:00
parent 059ece50d9
commit 44f01c48da
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/commands/default/general.py
View file

@ -448,10 +448,6 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS):
if not receiver: if not receiver:
return return
if caller == receiver:
caller.msg("You can't whisper to yourself.")
return
speech = self.rhs speech = self.rhs
# Call a hook to change the speech before whispering # Call a hook to change the speech before whispering
speech = caller.at_before_say(speech, whisper=True, receiver=receiver) speech = caller.at_before_say(speech, whisper=True, receiver=receiver)

10
evennia/objects/objects.py
View file

@ -1638,13 +1638,15 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
}) })
if msg_self: if msg_self:
self_mapping = {k: v.get_display_name(self) if hasattr( self_mapping = {key: "yourself" if key == "receiver" and val is self
v, "get_display_name") else str(v) for k, v in mapping.items()} else val.get_display_name(self) if hasattr(val, "get_display_name")
else str(val) for key, val in mapping.items()}
self.msg(msg_self.format(**self_mapping)) self.msg(msg_self.format(**self_mapping))
if receiver and msg_receiver: if receiver and msg_receiver:
receiver_mapping = {k: v.get_display_name(receiver) if hasattr( receiver_mapping = {key: val.get_display_name(receiver)
v, "get_display_name") else str(v) for k, v in mapping.items()} if hasattr(val, "get_display_name")
else str(val) for key, val in mapping.items()}
receiver.msg(msg_receiver.format(**receiver_mapping)) receiver.msg(msg_receiver.format(**receiver_mapping))
if self.location and msg_location: if self.location and msg_location: