Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjusted checks for Object/Account to prevent conflicts.

Browse source
This commit is contained in:
Andrew Bastien 2023-11-21 16:37:49 -05:00
parent b4a3bae6a9
commit 30bfc36beb
9 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/locks/lockfuncs.py
View file

@ -515,7 +515,7 @@ def is_ooc(accessing_obj, accessed_obj, *args, **kwargs):
function will still return True.
"""
obj = accessed_obj.obj if hasattr(accessed_obj, "obj") else accessed_obj
account = obj.account if hasattr(obj, "account") else obj
account = obj.account if hasattr(obj, "has_account") else obj
if not account:
return True
try:

4
evennia/locks/lockhandler.py
View file

@ -553,7 +553,7 @@ class LockHandler:
if not no_superuser_bypass and (
(hasattr(accessing_obj, "is_superuser") and accessing_obj.is_superuser)
or (
hasattr(accessing_obj, "account")
hasattr(accessing_obj, "has_account")
and hasattr(accessing_obj.account, "is_superuser")
and accessing_obj.account.is_superuser
)
@ -627,7 +627,7 @@ class LockHandler:
if no_superuser_bypass and (
(hasattr(accessing_obj, "is_superuser") and accessing_obj.is_superuser)
or (
hasattr(accessing_obj, "account")
hasattr(accessing_obj, "has_account")
and hasattr(accessing_obj.account, "is_superuser")
and accessing_obj.account.is_superuser
)