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

Fixed conflicts against master.

Browse source
This commit is contained in:
Griatch 2015-10-18 12:43:43 +02:00
commit b952a290b5
18 changed files with 307 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/objects/objects.py
View file

@ -370,7 +370,7 @@ class DefaultObject(ObjectDB):
if quiet:
return results
return _AT_SEARCH_RESULT(self, searchdata, results, global_search=True)
return _AT_SEARCH_RESULT(results, self, query=searchdata)
def execute_cmd(self, raw_string, sessid=None, **kwargs):
"""