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

fixed error occurring when caller does not have a player attribute

Browse source
This commit is contained in:
Dan Feeney 2016-09-07 08:13:49 -05:00 • committed by Griatch
parent 5349ecfd61
commit 4330d37f20
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
evennia/utils/evmenu.py
View file

@ -234,18 +234,19 @@ class CmdEvMenuNode(Command):
if _restore(caller): if _restore(caller):
return return
orig_caller = caller orig_caller = caller
caller = caller.player if hasattr(caller, 'player'):
menu = caller.ndb._menutree caller = caller.player
if not menu:
if _restore(caller):
return
caller = self.session
menu = caller.ndb._menutree menu = caller.ndb._menutree
if not menu: if not menu:
# can't restore from a session if _restore(caller):
err = "Menu object not found as %s.ndb._menutree!" % (orig_caller) return
orig_caller.msg(err) caller = self.session
raise EvMenuError(err) menu = caller.ndb._menutree
if not menu:
# can't restore from a session
err = "Menu object not found as %s.ndb._menutree!" % (orig_caller)
orig_caller.msg(err)
raise EvMenuError(err)
# we have a menu, use it. # we have a menu, use it.
menu._input_parser(menu, self.raw_string, caller) menu._input_parser(menu, self.raw_string, caller)