From 7347aef9fd5a3d2479da0b16ec81edb85353f7d3 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Thu, 12 Feb 2015 22:24:06 -0800 Subject: [PATCH] Fix permissions bug due to class rename. evennia.objects.objects.Object was renamed to evennia.objects.objects.DefaultObject. --- evennia/locks/lockfuncs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py index b3393701b2..ea44980d5f 100644 --- a/evennia/locks/lockfuncs.py +++ b/evennia/locks/lockfuncs.py @@ -89,7 +89,7 @@ _PERMISSION_HIERARCHY = [p.lower() for p in settings.PERMISSION_HIERARCHY] def _to_player(accessing_obj): "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. accessing_obj = accessing_obj.player return accessing_obj @@ -158,7 +158,7 @@ def perm(accessing_obj, accessed_obj, *args, **kwargs): except (AttributeError, IndexError): 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 perms_player = [p.lower() for p in player.permissions.all()] is_quell = player.attributes.get("_quell")