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

8
evennia/utils/evmenu.py
View file

@ -423,7 +423,7 @@ class CmdEvMenuNode(Command):
if _restore(caller):
return
orig_caller = caller
caller = caller.account if hasattr(caller, "account") else None
caller = caller.account if hasattr(caller, "has_account") else None
menu = caller.ndb._evmenu if caller else None
if not menu:
if caller and _restore(caller):
@ -1497,7 +1497,7 @@ class CmdGetInput(Command):
caller = self.caller
try:
getinput = caller.ndb._getinput
if not getinput and hasattr(caller, "account"):
if not getinput and (hasattr(caller, "has_account")):
getinput = caller.account.ndb._getinput
if getinput:
caller = caller.account
@ -1618,7 +1618,7 @@ class CmdYesNoQuestion(Command):
def _clean(self, caller):
del caller.ndb._yes_no_question
if not caller.cmdset.has(YesNoQuestionCmdSet) and hasattr(caller, "account"):
if not caller.cmdset.has(YesNoQuestionCmdSet) and hasattr(caller, "has_account"):
caller.account.cmdset.remove(YesNoQuestionCmdSet)
else:
caller.cmdset.remove(YesNoQuestionCmdSet)
@ -1628,7 +1628,7 @@ class CmdYesNoQuestion(Command):
caller = self.caller
try:
yes_no_question = caller.ndb._yes_no_question
if not yes_no_question and hasattr(caller, "account"):
if not yes_no_question and hasattr(caller, "has_account"):
yes_no_question = caller.account.ndb._yes_no_question
caller = caller.account

2
evennia/utils/evmore.py
View file

@ -78,7 +78,7 @@ class CmdMore(Command):
Implement the command
"""
more = self.caller.ndb._more
if not more and hasattr(self.caller, "account"):
if not more and hasattr(self.caller, "has_account"):
more = self.caller.account.ndb._more
if not more:
self.caller.msg("Error in loading the pager. Contact an admin.")