Skip to content

Fixes an NPE and InvalidOperationException. #766

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

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Fixes an NPE and InvalidOperationException. #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9e24c1
Null check on player object.
valkyrieBae Jan 16, 2023
a826769
Update Minimap custom pin removal to not throw error.
valkyrieBae Jan 16, 2023
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
8 changes: 7 additions & 1 deletion ValheimPlus/GameClasses/Minimap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,16 +414,22 @@ public static void Postfix(ref Minimap __instance, Player player, float dt, bool
}
}
}

List<ZDO> toRemove = new List<ZDO>();

// clear pins for destroyed objects
foreach (KeyValuePair<ZDO, Minimap.PinData> pin in customPins)
{
if (!pin.Key.IsValid())
{
__instance.RemovePin(pin.Value);
customPins.Remove(pin.Key);
toRemove.Add(pin.Key);
}
}

foreach (ZDO zdo in toRemove) {
customPins.Remove(zdo);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ValheimPlus/UI/HotkeyBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static void DisplayAmmoCountsUnderBowHotbarIcon(HotkeyBar __instance, Pl
}

// If there is no bow or it is not equipped, remove the text element
if (bow == null || (Configuration.Current.Hud.displayBowAmmoCounts == 1 && !player.IsItemEquiped(bow)))
if (bow == null || (Configuration.Current.Hud.displayBowAmmoCounts == 1 && player != null && !player.IsItemEquiped(bow)))
{
if (ammoCounter != null)
{
Expand Down