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

Some further fixes.

Browse source
This commit is contained in:
Griatch 2013-02-14 17:55:05 +01:00
parent e345d659fd
commit 4dea96f5e4
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/players/models.py
View file

@ -613,7 +613,7 @@ class PlayerDB(TypedObject):
break
return cmdhandler.cmdhandler(self.typeclass, raw_string, sessid=sessid)
def search(self, ostring, return_character=False):
def search(self, ostring, return_character=False, **kwargs):
"""
This is similar to the ObjectDB search method but will search for Players only. Errors
will be echoed, and None returned if no Player is found.
@ -621,6 +621,8 @@ class PlayerDB(TypedObject):
return_character - will try to return the character the player controls instead of
the Player object itself. If no Character exists (since Player is
OOC), None will be returned.
Extra keywords are ignored, but are allowed in call in order to make API more consistent
with objects.models.TypedObject.search.
"""
matches = _GA(self, "__class__").objects.player_search(ostring)
matches = _AT_SEARCH_RESULT(self, ostring, matches, global_search=True)

4
src/players/player.py
View file

@ -136,10 +136,12 @@ class Player(TypeClass):
"""
return self.dbobj.execute_cmd(raw_string, sessid=sessid)
def search(self, ostring, return_character=False):
def search(self, ostring, return_character=False, **kwargs):
"""
This method mimicks object.search if self.character is set. Otherwise only
other Players can be searched with this method.
extra keywords are accepted but ignored to make API more consistent with
TypedObject.search.
"""
return self.dbobj.search(ostring, return_character=return_character)