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

Some more cleanup.

Browse source
This commit is contained in:
Griatch 2014-04-30 20:31:13 +02:00
parent 86b771fb68
commit 047eee4bed
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/objects/models.py
View file

@ -493,7 +493,7 @@ class ObjectDB(TypedObject):
if from_obj:
# call hook
try:
_GA(from_obj, "at_msg_send")(text=text, to_obj=self.typeclass, **kwargs)
_GA(from_obj, "at_msg_send")(text=text, to_obj=_GA(self, "typeclass"), **kwargs)
except Exception:
logger.log_trace()
try:
@ -575,7 +575,7 @@ class ObjectDB(TypedObject):
# Before the move, call eventual pre-commands.
try:
if not self.at_before_move(destination.typeclass):
if not self.at_before_move(_GA(destination, "typeclass")):
return
except Exception:
logerr(errtxt % "at_before_move()")
@ -596,7 +596,7 @@ class ObjectDB(TypedObject):
# Call hook on source location
try:
source_location.at_object_leave(self.typeclass, destination.typeclass)
source_location.at_object_leave(_GA(self, "typeclass"), _GA(destination, "typeclass"))
except Exception:
logerr(errtxt % "at_object_leave()")
#emit_to_obj.msg(errtxt % "at_object_leave()")
@ -606,7 +606,7 @@ class ObjectDB(TypedObject):
if not quiet:
#tell the old room we are leaving
try:
self.announce_move_from(destination.typeclass)
self.announce_move_from(_GA(destination, "typeclass"))
except Exception:
logerr(errtxt % "at_announce_move()")
#emit_to_obj.msg(errtxt % "at_announce_move()" )
@ -625,7 +625,7 @@ class ObjectDB(TypedObject):
if not quiet:
# Tell the new room we are there.
try:
self.announce_move_to(source_location.typeclass)
self.announce_move_to(_GA(source_location, "typeclass"))
except Exception:
logerr(errtxt % "announce_move_to()")
#emit_to_obj.msg(errtxt % "announce_move_to()")
@ -635,7 +635,7 @@ class ObjectDB(TypedObject):
# Perform eventual extra commands on the receiving location
# (the object has already arrived at this point)
try:
destination.at_object_receive(self.typeclass, source_location.typeclass)
destination.at_object_receive(_GA(self, "typeclass"), _GA(source_location, "typeclass"))
except Exception:
logerr(errtxt % "at_object_receive()")
#emit_to_obj.msg(errtxt % "at_object_receive()")
@ -645,7 +645,7 @@ class ObjectDB(TypedObject):
# Execute eventual extra commands on this object after moving it
# (usually calling 'look')
try:
self.at_after_move(source_location.typeclass)
self.at_after_move(_GA(source_location, "typeclass"))
except Exception:
logerr(errtxt % "at_after_move")
#emit_to_obj.msg(errtxt % "at_after_move()")