Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-31 13:07:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Resolve merge conflict

Browse source
This commit is contained in:
Griatch 2019-01-17 23:04:11 +01:00
commit 7fc74f3d2e
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
evennia/objects/objects.py
View file

@ -432,6 +432,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
# only allow exact matching if searching the entire database
# or unique #dbrefs
exact = True
candidates = None
elif candidates is None:
# no custom candidates given - get them automatically