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

Change move_to behavior when moving from None location. Before, this would force a source location (usually home) but this hides the actual source location, and a None-location has been handled by the announce hooks for some time. Resolves #1011.

Browse source
This commit is contained in:
Griatch 2016-08-07 19:57:13 +02:00
parent faeb92f17d
commit 69252340d9
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
evennia/objects/objects.py
View file

@ -301,10 +301,10 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
typeclass (str or Typeclass, or list of either): Limit search only typeclass (str or Typeclass, or list of either): Limit search only
to `Objects` with this typeclass. May be a list of typeclasses to `Objects` with this typeclass. May be a list of typeclasses
for a broader search. for a broader search.
location (Object or list): Specify a location or multiple locations location (Object or list): Specify a location or multiple locations
to search. Note that this is used to query the *contents* of a to search. Note that this is used to query the *contents* of a
location and will not match for the location itself - location and will not match for the location itself -
if you want that, don't set this or use `candidates` to specify if you want that, don't set this or use `candidates` to specify
exactly which objects should be searched. exactly which objects should be searched.
attribute_name (str): Define which property to search. If set, no attribute_name (str): Define which property to search. If set, no
key+alias search will be performed. This can be used key+alias search will be performed. This can be used
@ -626,17 +626,9 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
# Save the old location # Save the old location
source_location = self.location source_location = self.location
if not source_location:
# there was some error in placing this room.
# we have to set one or we won't be able to continue
if self.home:
source_location = self.home
else:
default_home = ObjectDB.objects.get_id(settings.DEFAULT_HOME)
source_location = default_home
# Call hook on source location # Call hook on source location
if move_hooks: if move_hooks and source_location:
try: try:
source_location.at_object_leave(self, destination) source_location.at_object_leave(self, destination)
except Exception as err: except Exception as err: