Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Probility Fixes #34

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Probility Fixes #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions GloryOfEfficiency/Huds/FishingProbabilitiesBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down