From fbfd6629373a4bfdfac8e9df7a2ef5115c3bc709 Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 12 Oct 2020 19:49:18 +0200 Subject: [PATCH] Revert some objtag lockfunc changes, related to #2227. --- evennia/locks/lockfuncs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py index 0f06470860..7814d1a85b 100644 --- a/evennia/locks/lockfuncs.py +++ b/evennia/locks/lockfuncs.py @@ -539,8 +539,6 @@ def objtag(accessing_obj, accessed_obj, *args, **kwargs): Only true if accessed_obj has the specified tag and optional category. """ - if hasattr(accessed_obj, "obj"): - accessed_obj = accessed_obj.obj tagkey = args[0] if args else None category = args[1] if len(args) > 1 else None return bool(accessed_obj.tags.get(tagkey, category=category)) @@ -572,6 +570,9 @@ def inside_rec(accessing_obj, accessed_obj, *args, **kwargs): in your inventory will also pass the lock). """ + if hasattr(accessed_obj, "obj"): + accessed_obj = accessed_obj.obj + def _recursive_inside(obj, accessed_obj, lvl=1): if obj.location: if obj.location == accessed_obj: