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

Explict bool return for move_to, typo fix

Browse source
This commit is contained in:
BlauFeuer 2017-03-30 01:27:34 -04:00 • committed by GitHub
parent 3811c074c6
commit 6133280154
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/objects/objects.py
View file

@ -551,7 +551,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
""" """
Emits a message to all objects inside this object. Emits a message to all objects inside this object.
Argsu: Args:
text (str or tuple): Message to send. If a tuple, this should be text (str or tuple): Message to send. If a tuple, this should be
on the valid OOB outmessage form `(message, {kwargs})`, on the valid OOB outmessage form `(message, {kwargs})`,
where kwargs are optional data passed to the `text` where kwargs are optional data passed to the `text`
@ -611,7 +611,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
outmessage = inmessage.format(**substitutions) outmessage = inmessage.format(**substitutions)
else: else:
outmessage = inmessage outmessage = inmessage
obj.msg(text=(outmessage, outkwargs), from_obj=from_obj, **kwargs) obj.msg(text=(outmessage, outkwargs), from_obj=from_obj, **kwargs)
def move_to(self, destination, quiet=False, def move_to(self, destination, quiet=False,
@ -673,7 +672,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
self.location = None self.location = None
return True return True
emit_to_obj.msg(_("The destination doesn't exist.")) emit_to_obj.msg(_("The destination doesn't exist."))
return return False
if destination.destination and use_destination: if destination.destination and use_destination:
# traverse exits # traverse exits
destination = destination.destination destination = destination.destination
@ -682,7 +681,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
if move_hooks: if move_hooks:
try: try:
if not self.at_before_move(destination): if not self.at_before_move(destination):
return return False
except Exception as err: except Exception as err:
logerr(errtxt % "at_before_move()", err) logerr(errtxt % "at_before_move()", err)
return False return False