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

Some minor cleanups related to typeclass lookup calls.

Browse source
This commit is contained in:
Griatch 2014-04-30 20:11:40 +02:00
parent 0cae40f41a
commit 86b771fb68
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: if from_obj:
# call hook # call hook
try: try:
_GA(from_obj, "at_msg_send")(text=text, to_obj=self, **kwargs) _GA(from_obj, "at_msg_send")(text=text, to_obj=self.typeclass, **kwargs)
except Exception: except Exception:
logger.log_trace() logger.log_trace()
try: try:
@ -575,7 +575,7 @@ class ObjectDB(TypedObject):
# Before the move, call eventual pre-commands. # Before the move, call eventual pre-commands.
try: try:
if not self.at_before_move(destination): if not self.at_before_move(destination.typeclass):
return return
except Exception: except Exception:
logerr(errtxt % "at_before_move()") logerr(errtxt % "at_before_move()")
@ -596,7 +596,7 @@ class ObjectDB(TypedObject):
# Call hook on source location # Call hook on source location
try: try:
source_location.at_object_leave(self, destination) source_location.at_object_leave(self.typeclass, destination.typeclass)
except Exception: except Exception:
logerr(errtxt % "at_object_leave()") logerr(errtxt % "at_object_leave()")
#emit_to_obj.msg(errtxt % "at_object_leave()") #emit_to_obj.msg(errtxt % "at_object_leave()")
@ -606,7 +606,7 @@ class ObjectDB(TypedObject):
if not quiet: if not quiet:
#tell the old room we are leaving #tell the old room we are leaving
try: try:
self.announce_move_from(destination) self.announce_move_from(destination.typeclass)
except Exception: except Exception:
logerr(errtxt % "at_announce_move()") logerr(errtxt % "at_announce_move()")
#emit_to_obj.msg(errtxt % "at_announce_move()" ) #emit_to_obj.msg(errtxt % "at_announce_move()" )
@ -625,7 +625,7 @@ class ObjectDB(TypedObject):
if not quiet: if not quiet:
# Tell the new room we are there. # Tell the new room we are there.
try: try:
self.announce_move_to(source_location) self.announce_move_to(source_location.typeclass)
except Exception: except Exception:
logerr(errtxt % "announce_move_to()") logerr(errtxt % "announce_move_to()")
#emit_to_obj.msg(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 # Perform eventual extra commands on the receiving location
# (the object has already arrived at this point) # (the object has already arrived at this point)
try: try:
destination.at_object_receive(self, source_location) destination.at_object_receive(self.typeclass, source_location.typeclass)
except Exception: except Exception:
logerr(errtxt % "at_object_receive()") logerr(errtxt % "at_object_receive()")
#emit_to_obj.msg(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 # Execute eventual extra commands on this object after moving it
# (usually calling 'look') # (usually calling 'look')
try: try:
self.at_after_move(source_location) self.at_after_move(source_location.typeclass)
except Exception: except Exception:
logerr(errtxt % "at_after_move") logerr(errtxt % "at_after_move")
#emit_to_obj.msg(errtxt % "at_after_move()") #emit_to_obj.msg(errtxt % "at_after_move()")