From 8b2fea320f2965df73203fd4e69ea9482652b275 Mon Sep 17 00:00:00 2001 From: Andrew Bastien Date: Fri, 24 Nov 2023 16:30:09 -0500 Subject: [PATCH] Lockfuncs are now called with an access_type kwarg in their **kwargs --- evennia/locks/lockhandler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py index c5fa0aa240..7e3bb0a35b 100644 --- a/evennia/locks/lockhandler.py +++ b/evennia/locks/lockhandler.py @@ -572,7 +572,8 @@ class LockHandler: evalstring, func_tup, raw_string = self.locks[access_type] # execute all lock funcs in the correct order, producing a tuple of True/False results. true_false = tuple( - bool(tup[0](accessing_obj, self.obj, *tup[1], **tup[2])) for tup in func_tup + bool(tup[0](accessing_obj, self.obj, *tup[1], access_type=access_type, **tup[2])) + for tup in func_tup ) # the True/False tuple goes into evalstring, which combines them # with AND/OR/NOT in order to get the final result.