From d22595f6d2a368154a1efc9f0878031c8d1cd90d Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Thu, 4 Jul 2024 14:39:14 +0200
Subject: [PATCH] Pickup ingredients when activating flora

---
 src/EventListener.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/EventListener.cpp b/src/EventListener.cpp
index 17c4902..75104e1 100644
--- a/src/EventListener.cpp
+++ b/src/EventListener.cpp
@@ -110,13 +110,17 @@ auto EventListener::ProcessEvent(
 			bAdd = a_refBase->Is(RE::FormType::Misc) && a_refBase->As<RE::BGSKeywordForm>()->HasKeyword(keywordIngot);
 
 		} else if (bIsFlora || bIsTree || bIsIngredient) {
-			const auto floraBase = a_refBase->As<RE::TESFlora>();
-			if (floraBase && (floraBase->produceItem == produceItem || floraBase->produceItem == baseObj)) {
+			if (a_refBase == produceItem) {
 				bAdd = true;
 			} else {
-				const auto treeBase = a_refBase->As<RE::TESObjectTREE>();
-				if (treeBase && (treeBase->produceItem == produceItem || treeBase->produceItem == baseObj)) {
+				const auto floraBase = a_refBase->As<RE::TESFlora>();
+				if (floraBase && (floraBase->produceItem == produceItem || floraBase->produceItem == baseObj)) {
 					bAdd = true;
+				} else {
+					const auto treeBase = a_refBase->As<RE::TESObjectTREE>();
+					if (treeBase && (treeBase->produceItem == produceItem || treeBase->produceItem == baseObj)) {
+						bAdd = true;
+					}
 				}
 			}
 		}