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

Merge branch 'patch-2' of https://github.com/ahmedcharles/evennia into ahmedcharles-patch-1

Browse source
This commit is contained in:
Griatch 2015-02-13 07:39:15 +01:00
commit 48774d0f3c
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/locks/lockfuncs.py
View file

@ -89,7 +89,7 @@ _PERMISSION_HIERARCHY = [p.lower() for p in settings.PERMISSION_HIERARCHY]
def _to_player(accessing_obj): def _to_player(accessing_obj):
"Helper function. Makes sure an accessing object is a player object" "Helper function. Makes sure an accessing object is a player object"
if utils.inherits_from(accessing_obj, "evennia.objects.objects.Object"): if utils.inherits_from(accessing_obj, "evennia.objects.objects.DefaultObject"):
# an object. Convert to player. # an object. Convert to player.
accessing_obj = accessing_obj.player accessing_obj = accessing_obj.player
return accessing_obj return accessing_obj
@ -158,7 +158,7 @@ def perm(accessing_obj, accessed_obj, *args, **kwargs):
except (AttributeError, IndexError): except (AttributeError, IndexError):
return False return False
if utils.inherits_from(accessing_obj, "evennia.objects.objects.Object") and accessing_obj.player: if utils.inherits_from(accessing_obj, "evennia.objects.objects.DefaultObject") and accessing_obj.player:
player = accessing_obj.player player = accessing_obj.player
perms_player = [p.lower() for p in player.permissions.all()] perms_player = [p.lower() for p in player.permissions.all()]
is_quell = player.attributes.get("_quell") is_quell = player.attributes.get("_quell")