Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-23 08:16:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'from-obj' of https://github.com/fariparedes/evennia into fariparedes-from-obj

Browse source
This commit is contained in:
Griatch 2021-04-06 21:11:31 +02:00
commit 1c47bbe2dd
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/objects/objects.py
View file

@ -628,7 +628,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
logger.log_trace()
kwargs["options"] = options
try:
if not self.at_msg_receive(text=text, **kwargs):
if not self.at_msg_receive(text=text, from_obj=from_obj, **kwargs):
# if at_msg_receive returns false, we abort message to this object
return
except Exception:
@ -1443,7 +1443,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
}
)
location.msg_contents(string, exclude=(self,), mapping=mapping)
location.msg_contents(string, exclude=(self,), from_obj=self, mapping=mapping)
def announce_move_to(self, source_location, msg=None, mapping=None, **kwargs):
"""
@ -1505,7 +1505,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
}
)
destination.msg_contents(string, exclude=(self,), mapping=mapping)
destination.msg_contents(string, exclude=(self,), from_obj=self, mapping=mapping)
def at_after_move(self, source_location, **kwargs):
"""