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

fix: Adds null-conditional checks when stopping timers for TownCrier (#2206)

Browse source
This commit is contained in:
Bohica 2025-06-01 13:33:09 -07:00 • committed by GitHub
parent 35ff4023c3
commit 7695174bcc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ public class TownCrierDurationPrompt : Prompt
{ {
if (!TimeSpan.TryParse(text, out var ts)) if (!TimeSpan.TryParse(text, out var ts))
{ {
from.SendMessage("Value was not properly formatted. Use: <hours:minutes:seconds>"); from.SendMessage("Value was not properly formatted. Use: <hours:minutes:seconds, 00:00:00>");
from.SendGump(new TownCrierGump(from, m_Owner)); from.SendGump(new TownCrierGump(from, m_Owner));
return; return;
} }
@ -272,7 +272,7 @@ public class TownCrierGump : Gump
{ {
if (info.ButtonID == 1) if (info.ButtonID == 1)
{ {
m_From.SendMessage("Enter the duration for the new message. Format: <hours:minutes:seconds>"); m_From.SendMessage("Enter the duration for the new message. Format: <hours:minutes:seconds, 00:00:00>");
m_From.Prompt = new TownCrierDurationPrompt(m_Owner); m_From.Prompt = new TownCrierDurationPrompt(m_Owner);
} }
else if (info.ButtonID > 1) else if (info.ButtonID > 1)
@ -433,7 +433,7 @@ public partial class TownCrier : Mobile, ITownCrierEntryList
if (tce == null) if (tce == null)
{ {
_autoShoutTimer.Stop(); _autoShoutTimer?.Stop();
_autoShoutTimer = null; _autoShoutTimer = null;
} }
else if (_newsTimer == null) else if (_newsTimer == null)
@ -454,7 +454,7 @@ public partial class TownCrier : Mobile, ITownCrierEntryList
var index = _newsTimer.Index; var index = _newsTimer.Index;
if (index >= tce.Lines.Length) if (index >= tce.Lines.Length)
{ {
_newsTimer.Stop(); _newsTimer?.Stop();
_newsTimer = null; _newsTimer = null;
} }
else else