From 11cf5ada87d2429010ab2cf2e83eab6f09c5b7bf Mon Sep 17 00:00:00 2001
From: Johnny <strikaco@users.noreply.github.com>
Date: Sun, 11 Oct 2020 23:18:02 +0000
Subject: [PATCH] Adds appropriate object checking to objtag lockfunc (partial
 fix for #2227).

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

diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py
index 4b23aae515..07da37fef3 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))