From d126d5cc322e7e5ca6cd2dc863c894dc899b22b9 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 14 Oct 2020 16:01:40 +0200
Subject: [PATCH] Re-revert of lockfunc change because I'm a dummy, as per
 #2228

---
 evennia/locks/lockfuncs.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py
index 7814d1a85b..b9c4624c7d 100644
--- a/evennia/locks/lockfuncs.py
+++ b/evennia/locks/lockfuncs.py
@@ -539,6 +539,8 @@ 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))