From f9e39af7989b7a01bfbac119dff6f7b7b5f8df5d Mon Sep 17 00:00:00 2001 From: Duncan Brown Date: Sat, 30 Apr 2022 15:50:55 -0400 Subject: [PATCH] fix: avoids crashing when selected_action is null (#586) * fix: avoids crashing when selected_action is null * fix: more robust handling suggested by @straton --- addons/escoria-ui-9verbs/game.gd | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/escoria-ui-9verbs/game.gd b/addons/escoria-ui-9verbs/game.gd index 93d98efe..78fb8268 100644 --- a/addons/escoria-ui-9verbs/game.gd +++ b/addons/escoria-ui-9verbs/game.gd @@ -180,6 +180,14 @@ func left_click_on_item(item_global_id: String, event: InputEvent) -> void: func right_click_on_item(item_global_id: String, event: InputEvent) -> void: + element_focused(item_global_id) + var object = escoria.object_manager.get_object(item_global_id) + if object != null: + verbs_menu.set_by_name(object.node.default_action) + + if verbs_menu.selected_action == null: + return + escoria.action_manager.set_current_action(verbs_menu.selected_action) escoria.action_manager.do( escoria.action_manager.ACTION.ITEM_RIGHT_CLICK,