From c166aa1cdb8483d1288f2b9b70a83ec259381bea Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Thu, 22 Feb 2024 16:18:08 +0000
Subject: [PATCH] Bugfix Side Bounties Stayed in Pause Menu after Completion

---
 .../.idea/.idea.EndlessVendetta/.idea/workspace.xml   |  4 +---
 .../Characters/BountyHunterCharacter.cpp              | 11 +++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 6d55a51c..609593f7 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -8,9 +8,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="dfa3053d-1d51-4dad-9270-4c17e086f627" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/PauseMenu/Tabs/BountyTabs/WBP_BountiesTab.uasset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/Characters/BountyHunterCharacter.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/Characters/BountyHunterCharacter.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -142,7 +140,7 @@
       <workItem from="1708180486567" duration="2641000" />
       <workItem from="1708269543495" duration="2914000" />
       <workItem from="1708434176965" duration="6053000" />
-      <workItem from="1708607826264" duration="2343000" />
+      <workItem from="1708607826264" duration="3320000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
index e9cf2b52..44257234 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
@@ -53,12 +53,15 @@ void ABountyHunterCharacter::CompleteCurrentMainBounty(UEVGameInstance* GI)
 
 void ABountyHunterCharacter::CompletedASideBounty(int CompletedSideBountiesUID)
 {
-	for (auto SBStruct : SideBountyStructs)
+	for (int i = 0; i < SideBountyStructs.Num(); i++)
 	{
-		if (SBStruct.SideBountyUID != CompletedSideBountiesUID) continue;
-		EarnMoney(SBStruct.MoneyEarnedForCompletion);
-		EarnFavours(SBStruct.FavoursEarnedForCompletion);
+		if (SideBountyStructs[i].SideBountyUID != CompletedSideBountiesUID) continue;
+		EarnMoney(SideBountyStructs[i].MoneyEarnedForCompletion);
+		EarnFavours(SideBountyStructs[i].FavoursEarnedForCompletion);
 		if (IsValid(PauseMenu)) PauseMenu->UpdatePlayerStatistics(Money, Favours);
+
+		SideBountyStructs.RemoveAt(i);
+		UpdateBountyTabInfo();
 	}
 }