From 7f1add6505189bb355a306a6b953e39952edc6d2 Mon Sep 17 00:00:00 2001 From: Duncan Brown Date: Fri, 23 Dec 2022 17:56:30 -0500 Subject: [PATCH] fix: missing this check to see if the item needs to be combined with something or not --- .../escoria-core/game/core-scripts/esc/esc_action_manager.gd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd index 65de762a..5b5218a6 100644 --- a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd +++ b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd @@ -528,7 +528,8 @@ func perform_inputevent_on_object( # Check if object must be in inventory to be used and update # action state if necessary if obj.node.use_from_inventory_only and \ - escoria.inventory_manager.inventory_has(obj.global_id): + escoria.inventory_manager.inventory_has(obj.global_id) and \ + need_combine: # We're missing a target here for our tool to be used on current_tool = obj