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

Optimizations: Removed unnecessary lookups when comparing objects with the = operator (used a lot in moving and messaging)

Browse source
This commit is contained in:
Griatch 2012-08-02 17:03:26 +02:00
parent 563361a676
commit 724027d134
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/objects/objects.py
View file

@ -19,6 +19,10 @@ from src.typeclasses.typeclass import TypeClass
from src.commands import cmdset, command
__all__ = ("Object", "Character", "Room", "Exit")
_GA = object.__getattribute__
_SA = object.__setattr__
_DA = object.__delattr__
#
# Base class to inherit from.
#
@ -358,11 +362,13 @@ class Object(TypeClass):
parent doesn't work.
"""
try:
return self.dbref == other or self.dbref == other.dbref
return _GA(self, "dbid") == other \
or _GA(self, "dbid") == _GA(other, "dbid")
except AttributeError:
# compare players instead
try:
return self.player.uid == other or self.player.uid == other.player.uid
return _GA(_GA(self, "player"),"uid") == other \
or _GA(_GA(self, "player"),"uid") == _GA(_GA(other, "player"),"uid")
except AttributeError:
return False