Merge pull request #34 from Sandman534/develop16

Probility Fixes
Hackswell · Jul 11, 2024 · da6abc6 · da6abc6
2 parents f84bbc9 + 95e55ed
commit da6abc6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/GloryOfEfficiency/Huds/FishingProbabilitiesBox.cs b/GloryOfEfficiency/Huds/FishingProbabilitiesBox.cs
@@ -1,6 +1,7 @@
 using GloryOfEfficiency.Core;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using Netcode;
 using StardewValley;
 using StardewValley.GameData;
 using StardewValley.GameData.Locations;
@@ -29,7 +30,7 @@ public static void UpdateProbabilities(FishingRod rod)
         {
             if (rod.isFishing)
             {
-                if (_isFirstTimeOfFishing)
+                if (_isFirstTimeOfFishing && InstanceHolder.Config.FishingProbabilitiesInfo)
                 {
                     // Only run the probablies once when line is cast
                     _isFirstTimeOfFishing = false;
@@ -48,8 +49,10 @@ public static void UpdateProbabilities(FishingRod rod)
 
                     // Populate Fish and Tackle
                     _fishingDictionary = GetFishes(location, vector, clearWaterDistance + (flag ? 1 : 0), Game1.player, rod, InstanceHolder.Config.MorePreciseProbabilities ? InstanceHolder.Config.TrialOfExamine : 1);
-                    _attachmentDictionary = GetAttachments(rod);
                 }
+
+                if (InstanceHolder.Config.FishingTackleInfo)
+                    _attachmentDictionary = GetAttachments(rod);
             }
 
             // Clear out lists when not fishing
@@ -419,7 +422,7 @@ private static bool IsGarbage(string item)
             var objectData = Game1.objectData[itemID];
 
             // Fish items that are not fish
-            if (objectData != null && objectData.ContextTags.Contains("fish_nonfish") && !objectData.ContextTags.Contains("counts_as_fish_catch"))
+            if (objectData != null && objectData.ContextTags != null && objectData.ContextTags.Contains("fish_nonfish") && !objectData.ContextTags.Contains("counts_as_fish_catch"))
                 return true;
 
             // JoJa Garbage