Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-18 14:19:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cleanup of some other reference calls.

Browse source
This commit is contained in:
Griatch 2014-04-30 20:38:46 +02:00
parent 047eee4bed
commit 23efa02965
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/players/models.py
View file

@ -243,7 +243,7 @@ class PlayerDB(TypedObject, AbstractUser):
if from_obj:
# call hook
try:
_GA(from_obj, "at_msg_send")(text=text, to_obj=self, **kwargs)
_GA(from_obj, "at_msg_send")(text=text, to_obj=_GA(self, "typeclass"), **kwargs)
except Exception:
pass
session = _MULTISESSION_MODE == 2 and sessid and _GA(self, "get_session")(sessid) or None
@ -320,7 +320,7 @@ class PlayerDB(TypedObject, AbstractUser):
# server kill or similar
if normal_mode:
_GA(obj.typeclass, "at_pre_puppet")(self.typeclass, sessid=sessid)
_GA(obj.typeclass, "at_pre_puppet")(_GA(self, "typeclass"), sessid=sessid)
# do the connection
obj.sessid = sessid
obj.player = self
@ -352,7 +352,7 @@ class PlayerDB(TypedObject, AbstractUser):
del obj.dbobj.player
session.puppet = None
session.puid = None
_GA(obj.typeclass, "at_post_unpuppet")(self.typeclass, sessid=sessid)
_GA(obj.typeclass, "at_post_unpuppet")(_GA(self, "typeclass"), sessid=sessid)
return True
def unpuppet_all(self):
@ -465,7 +465,7 @@ class PlayerDB(TypedObject, AbstractUser):
return_puppet = kwargs.get("return_character")
matches = _GA(self, "__class__").objects.player_search(searchdata)
matches = _AT_SEARCH_RESULT(self, searchdata, matches, global_search=True)
matches = _AT_SEARCH_RESULT(_GA(self, "typeclass"), searchdata, matches, global_search=True)
if matches and return_puppet:
try:
return _GA(matches, "puppet")