warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes town crier NPE (#942)

Browse source
This commit is contained in:
Kamron Batman 2022-02-23 21:21:20 -08:00 • committed by GitHub
parent 032f21ff27
commit dc2b00ec5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Projects/UOContent/Mobiles/Townfolk/TownCrier.cs
View file

@ -28,14 +28,9 @@ namespace Server.Mobiles
public TownCrierEntry GetRandomEntry() public TownCrierEntry GetRandomEntry()
{ {
if (Entries == null || Entries.Count == 0) for (var i = (Entries?.Count ?? 0) - 1; i >= 0; --i)
{ {
return null; if (i >= Entries!.Count)
}
for (var i = Entries.Count - 1; Entries != null && i >= 0; --i)
{
if (i >= Entries.Count)
{ {
continue; continue;
} }
@ -366,14 +361,9 @@ namespace Server.Mobiles
public TownCrierEntry GetRandomEntry() public TownCrierEntry GetRandomEntry()
{ {
if (Entries == null || Entries.Count == 0) for (var i = (Entries?.Count ?? 0) - 1; i >= 0; --i)
{ {
return GlobalTownCrierEntryList.Instance.GetRandomEntry(); if (i >= Entries!.Count)
}
for (var i = Entries.Count - 1; Entries != null && i >= 0; --i)
{
if (i >= Entries.Count)
{ {
continue; continue;
} }
@ -387,8 +377,12 @@ namespace Server.Mobiles
} }
var entry = GlobalTownCrierEntryList.Instance.GetRandomEntry(); var entry = GlobalTownCrierEntryList.Instance.GetRandomEntry();
if (entry == null || Entries?.Count > 0 && Utility.RandomBool())
{
entry = Entries.RandomElement();
}
return entry ?? (Entries?.Count > 0 && Utility.RandomBool() ? Entries.RandomElement() : null); return entry;
} }
public TownCrierEntry AddEntry(string[] lines, TimeSpan duration) public TownCrierEntry AddEntry(string[] lines, TimeSpan duration)
@ -420,7 +414,7 @@ namespace Server.Mobiles
if (Entries == null && GlobalTownCrierEntryList.Instance.IsEmpty) if (Entries == null && GlobalTownCrierEntryList.Instance.IsEmpty)
{ {
_autoShoutTimer.Stop(); _autoShoutTimer?.Stop();
_autoShoutTimer = null; _autoShoutTimer = null;
} }
} }