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

Fixed some issues with the _superuser_character bypass as well as the is_superuser property on objects. Also fixed a bug with @examine that caused it to display object Attribute instead of Player Attributes when called from the ooc state.

Browse source
This commit is contained in:
Griatch 2013-05-14 13:55:03 +02:00
parent 7a8e53b3bd
commit 77a0b47859
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/locks/lockhandler.py
View file

@ -260,10 +260,7 @@ class LockHandler(object):
before the login process has yet been fully finalized)
"""
#print "_superuser_character:", hasattr(obj, "get_attribute") and obj.get_attribute("_superuser_character")
self.lock_bypass = (hasattr(obj, "is_superuser") and obj.is_superuser
or ((hasattr(obj, "get_attribute") and obj.get_attribute("_superuser_character"))
and ((hasattr(obj, "player") and hasattr(obj.player, "is_superuser") and obj.player.is_superuser)
or (hasattr(obj, "get_player") and (not obj.get_player() or obj.get_player().is_superuser)))))
self.lock_bypass = hasattr(obj, "is_superuser") and obj.is_superuser
def add(self, lockstring, log_obj=None):
"""