diff --git a/Projects/Server/Gumps/Gump.cs b/Projects/Server/Gumps/Gump.cs index 5c1426e1e..7e7777850 100644 --- a/Projects/Server/Gumps/Gump.cs +++ b/Projects/Server/Gumps/Gump.cs @@ -291,7 +291,7 @@ public partial class Gump public static byte[] StringToBuffer(string str) => str.GetBytesAscii(); - public virtual void OnResponse(NetState sender, RelayInfo info) + public virtual void OnResponse(NetState sender, in RelayInfo info) { } diff --git a/Projects/Server/Gumps/RelayInfo.cs b/Projects/Server/Gumps/RelayInfo.cs index b0736e368..352f39e3c 100644 --- a/Projects/Server/Gumps/RelayInfo.cs +++ b/Projects/Server/Gumps/RelayInfo.cs @@ -1,19 +1,36 @@ +/************************************************************************* + * ModernUO * + * Copyright 2019-2024 - ModernUO Development Team * + * Email: hi@modernuo.com * + * File: RelayInfo.cs * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + *************************************************************************/ + +using System; + namespace Server.Gumps; -public class TextRelay +public readonly struct TextRelay { - public TextRelay(int entryID, string text) + public TextRelay(int entryId, string text) { - EntryID = entryID; + EntryId = entryId; Text = text; } - public int EntryID { get; } + public int EntryId { get; } public string Text { get; } } -public class RelayInfo +public ref struct RelayInfo { public RelayInfo(int buttonID, int[] switches, TextRelay[] textEntries) { @@ -24,9 +41,9 @@ public class RelayInfo public int ButtonID { get; } - public int[] Switches { get; } + public ReadOnlySpan Switches { get; } - public TextRelay[] TextEntries { get; } + public ReadOnlySpan TextEntries { get; } public bool IsSwitched(int switchID) { @@ -41,16 +58,16 @@ public class RelayInfo return false; } - public TextRelay GetTextEntry(int entryID) + public string GetTextEntry(int entryId) { for (var i = 0; i < TextEntries.Length; ++i) { - if (TextEntries[i].EntryID == entryID) + if (TextEntries[i].EntryId == entryId) { - return TextEntries[i]; + return TextEntries[i].Text; } } - return null; + return default; } -} \ No newline at end of file +} diff --git a/Projects/Server/Items/VirtualCheck.cs b/Projects/Server/Items/VirtualCheck.cs index ab7c690d8..05c56c45e 100644 --- a/Projects/Server/Items/VirtualCheck.cs +++ b/Projects/Server/Items/VirtualCheck.cs @@ -303,7 +303,7 @@ public sealed partial class VirtualCheck : Item AddButton(305, 128, 12000, 12002, (int)Buttons.Accept); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (Check?.Deleted != false || sender.Mobile != User) { @@ -324,8 +324,8 @@ public sealed partial class VirtualCheck : Item } case Buttons.Accept: { - var platText = info.GetTextEntry(0).Text; - var goldText = info.GetTextEntry(1).Text; + var platText = info.GetTextEntry(0); + var goldText = info.GetTextEntry(1); if (!int.TryParse(platText, out _plat)) { diff --git a/Projects/UOContent/Commands/Batch.cs b/Projects/UOContent/Commands/Batch.cs index ae9068bd7..8b4ce4a25 100644 --- a/Projects/UOContent/Commands/Batch.cs +++ b/Projects/UOContent/Commands/Batch.cs @@ -307,37 +307,21 @@ namespace Server.Commands FinishPage(); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!SplitButtonID(info.ButtonID, 1, out var type, out var index)) { return; } - var entry = info.GetTextEntry(0); - - if (entry != null) - { - m_Batch.Condition = entry.Text; - } + m_Batch.Condition = info.GetTextEntry(0) ?? ""; for (var i = m_Batch.BatchCommands.Count - 1; i >= 0; --i) { var sc = m_Batch.BatchCommands[i]; - entry = info.GetTextEntry(1 + i * 2); - - if (entry != null) - { - sc.Command = entry.Text; - } - - entry = info.GetTextEntry(2 + i * 2); - - if (entry != null) - { - sc.Object = entry.Text; - } + sc.Command = info.GetTextEntry(1 + i * 2); + sc.Object = info.GetTextEntry(2 + i * 2); if (sc.Command.Length == 0 && sc.Object.Length == 0) { @@ -417,7 +401,7 @@ namespace Server.Commands FinishPage(); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (SplitButtonID(info.ButtonID, 1, out var type, out var index)) { diff --git a/Projects/UOContent/Commands/Generic/Commands/Interface.cs b/Projects/UOContent/Commands/Generic/Commands/Interface.cs index d9c0c482b..df8a836cd 100644 --- a/Projects/UOContent/Commands/Generic/Commands/Interface.cs +++ b/Projects/UOContent/Commands/Generic/Commands/Interface.cs @@ -232,7 +232,7 @@ namespace Server.Commands.Generic FinishPage(); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { switch (info.ButtonID) { @@ -349,7 +349,7 @@ namespace Server.Commands.Generic CommandSystem.Handle(m_From, $"{CommandSystem.Prefix}{ip}"); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Item.Deleted) { @@ -515,7 +515,7 @@ namespace Server.Commands.Generic CommandSystem.Handle(m_From, $"{CommandSystem.Prefix}{ip}"); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Mobile.Deleted) { diff --git a/Projects/UOContent/Commands/HelpInfo.cs b/Projects/UOContent/Commands/HelpInfo.cs index 3cdeb4763..4b1e81186 100644 --- a/Projects/UOContent/Commands/HelpInfo.cs +++ b/Projects/UOContent/Commands/HelpInfo.cs @@ -287,7 +287,7 @@ public static class HelpInfo FinishPage(); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var m = sender.Mobile; switch (info.ButtonID) diff --git a/Projects/UOContent/Commands/Object Creation/AddGump.cs b/Projects/UOContent/Commands/Object Creation/AddGump.cs index 0a78f5921..953ad6236 100644 --- a/Projects/UOContent/Commands/Object Creation/AddGump.cs +++ b/Projects/UOContent/Commands/Object Creation/AddGump.cs @@ -194,7 +194,7 @@ namespace Server.Gumps return finalResults; } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; @@ -202,8 +202,7 @@ namespace Server.Gumps { case 1: // Search { - var te = info.GetTextEntry(0); - var match = te?.Text.Trim() ?? ""; + var match = info.GetTextEntry(0)?.Trim() ?? ""; if (match.Length < 3) { diff --git a/Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs b/Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs index 6234169fb..9e944b1ce 100644 --- a/Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs +++ b/Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs @@ -212,7 +212,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = m_Owner; diff --git a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs index 80fe12751..2dbbe85db 100644 --- a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs +++ b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs @@ -401,7 +401,7 @@ public class AdvancedSearchGump : Gump } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; if (from == null) @@ -430,21 +430,21 @@ public class AdvancedSearchGump : Gump Filter.FilterRegion = info.IsSwitched(319); Filter.FilterTerMur = info.IsSwitched(320); - var rangeText = info.GetTextEntry(100)?.Text; + var rangeText = info.GetTextEntry(100); Filter.Range = rangeText != null ? Utility.ToInt32(rangeText) : null; - var filterText = info.GetTextEntry(101)?.Text; + var filterText = info.GetTextEntry(101); Filter.Type = filterText != null ? AssemblyHandler.FindTypeByName(filterText) : null; - Filter.Name = info.GetTextEntry(102)?.Text; - Filter.PropertyTest = info.GetTextEntry(104)?.Text; + Filter.Name = info.GetTextEntry(102); + Filter.PropertyTest = info.GetTextEntry(104); - var ageText = info.GetTextEntry(105)?.Text; + var ageText = info.GetTextEntry(105); Filter.Age = ageText != null ? Utility.ToTimeSpan(ageText) : null; - Filter.RegionName = info.GetTextEntry(106)?.Text; + Filter.RegionName = info.GetTextEntry(106); - CommandString = info.GetTextEntry(301)?.Text; + CommandString = info.GetTextEntry(301); var buttonId = info.ButtonID; diff --git a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchWarningGump.cs b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchWarningGump.cs index f80c1a7d0..83748de55 100644 --- a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchWarningGump.cs +++ b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchWarningGump.cs @@ -51,7 +51,7 @@ public abstract class AdvancedSearchWarningGump : Gump AddHtmlLocalized(40 + (width - 20) / 2, height - 30, 170, 20, 1011012, 32767); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) => OnClickResponse(sender, info.ButtonID == 1); + public override void OnResponse(NetState sender, in RelayInfo info) => OnClickResponse(sender, info.ButtonID == 1); protected abstract void OnClickResponse(NetState sender, bool okay); } diff --git a/Projects/UOContent/Engines/Bulk Orders/Books/BOBFilterGump.cs b/Projects/UOContent/Engines/Bulk Orders/Books/BOBFilterGump.cs index d02247c4c..3dd830a44 100644 --- a/Projects/UOContent/Engines/Bulk Orders/Books/BOBFilterGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/Books/BOBFilterGump.cs @@ -154,7 +154,7 @@ namespace Server.Engines.BulkOrders } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var f = m_From.UseOwnFilter ? m_From.BOBFilter : m_Book.Filter; diff --git a/Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs b/Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs index 38b2bb33f..ac6267504 100644 --- a/Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs @@ -525,7 +525,7 @@ namespace Server.Engines.BulkOrders return "Invalid"; } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var index = info.ButtonID; diff --git a/Projects/UOContent/Engines/Bulk Orders/Books/BODBuyGump.cs b/Projects/UOContent/Engines/Bulk Orders/Books/BODBuyGump.cs index 8b8721c9d..06ab0f72d 100644 --- a/Projects/UOContent/Engines/Bulk Orders/Books/BODBuyGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/Books/BODBuyGump.cs @@ -38,7 +38,7 @@ namespace Server.Engines.BulkOrders AddHtmlLocalized(152, 130, 100, 24, 1011036); // OKAY } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 2) { diff --git a/Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs b/Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs index 476c78280..00b070dd9 100644 --- a/Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs @@ -82,7 +82,7 @@ namespace Server.Engines.BulkOrders AddHtmlLocalized(310, 216 + entries.Length * 24, 120, 20, 1011012, 0x7FFF); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) // Ok { diff --git a/Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs b/Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs index 0a8ee3d42..fe4c881da 100644 --- a/Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs @@ -90,7 +90,7 @@ namespace Server.Engines.BulkOrders AddHtmlLocalized(160, 192 + entries.Length * 24, 120, 20, 1011441, 0x7FFF); // EXIT } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Deed.Deleted || !m_Deed.IsChildOf(m_From.Backpack)) { diff --git a/Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs b/Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs index 088a404de..48150f7df 100644 --- a/Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs @@ -69,7 +69,7 @@ namespace Server.Engines.BulkOrders AddHtmlLocalized(310, 240, 120, 20, 1011012, 0x7FFF); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) // Ok { diff --git a/Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs b/Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs index 41468fcc9..9f70c55bf 100644 --- a/Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs @@ -69,7 +69,7 @@ namespace Server.Engines.BulkOrders AddHtmlLocalized(160, 216, 120, 20, 1011441, 0x7FFF); // EXIT } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Deed.Deleted || !m_Deed.IsChildOf(m_From.Backpack)) { diff --git a/Projects/UOContent/Engines/ConPVP/AcceptDuelGump.cs b/Projects/UOContent/Engines/ConPVP/AcceptDuelGump.cs index 7af823259..847d7613b 100644 --- a/Projects/UOContent/Engines/ConPVP/AcceptDuelGump.cs +++ b/Projects/UOContent/Engines/ConPVP/AcceptDuelGump.cs @@ -170,7 +170,7 @@ namespace Server.Engines.ConPVP return false; } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 1 || !m_Active || !m_Context.Registered) { diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/AcceptTeamGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/AcceptTeamGump.cs index f470806bf..d4c8418f1 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/AcceptTeamGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/AcceptTeamGump.cs @@ -301,7 +301,7 @@ namespace Server.Engines.ConPVP } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = m_From; var mob = m_Requested; diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs index 8f7a3cf97..8792d33b1 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs @@ -207,7 +207,7 @@ namespace Server.Engines.ConPVP sb.Append(le.Mobile.Name); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 1) { diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs index 1bd50b67a..518f5fc51 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs @@ -314,7 +314,7 @@ namespace Server.Engines.ConPVP AddButton(x + 3, y + 3, 0xD8, 0xD8, bid); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1 && info.IsSwitched(1)) { diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/DuelContextGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/DuelContextGump.cs index d36c4305b..157eafb70 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/DuelContextGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/DuelContextGump.cs @@ -81,7 +81,7 @@ namespace Server.Engines.ConPVP AddHtml(x + 25, y, 200, 20, text); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!Context.Registered) { diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs index 991c57835..d884d26dc 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs @@ -221,7 +221,7 @@ namespace Server.Engines.ConPVP }; } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs index 8b0ecc0e1..d74646c19 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs @@ -80,7 +80,7 @@ namespace Server.Engines.ConPVP AddHtml(x + 25, y, 200, 20, text); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!Context.Registered) { diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/PickRulesetGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/PickRulesetGump.cs index 4d10c2c89..81e3d3d11 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/PickRulesetGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/PickRulesetGump.cs @@ -82,7 +82,7 @@ namespace Server.Engines.ConPVP public string Center(string text) => $"
{text}
"; - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Context?.Registered == false) { diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/ReadyGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/ReadyGump.cs index 1b4c80645..4e8bcf0f1 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/ReadyGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/ReadyGump.cs @@ -102,7 +102,7 @@ namespace Server.Engines.ConPVP public string Center(string text) => $"
{text}
"; - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { } } diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/ReadyUpGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/ReadyUpGump.cs index 735379d2e..e11fa00f5 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/ReadyUpGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/ReadyUpGump.cs @@ -200,7 +200,7 @@ namespace Server.Engines.ConPVP AddButton(x + 3, y + 3, 0xD8, 0xD8, bid); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!m_Context.Registered || !m_Context.ReadyWait) { diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/RulesetGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/RulesetGump.cs index 73729c65b..e5ed4c5bc 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/RulesetGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/RulesetGump.cs @@ -83,7 +83,7 @@ namespace Server.Engines.ConPVP AddButton(x + 3, y + 3, 0xD8, 0xD8, bid); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_DuelContext?.Registered == false) { diff --git a/Projects/UOContent/Engines/ConPVP/Gumps/TournamentBracketGump.cs b/Projects/UOContent/Engines/ConPVP/Gumps/TournamentBracketGump.cs index 018d80b3b..896a61cc9 100644 --- a/Projects/UOContent/Engines/ConPVP/Gumps/TournamentBracketGump.cs +++ b/Projects/UOContent/Engines/ConPVP/Gumps/TournamentBracketGump.cs @@ -767,7 +767,7 @@ namespace Server.Engines.ConPVP } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!FromButtonID(info.ButtonID, out var type, out var index)) { diff --git a/Projects/UOContent/Engines/ConPVP/Preferences.cs b/Projects/UOContent/Engines/ConPVP/Preferences.cs index d36ed6b2d..39464350b 100644 --- a/Projects/UOContent/Engines/ConPVP/Preferences.cs +++ b/Projects/UOContent/Engines/ConPVP/Preferences.cs @@ -227,7 +227,7 @@ namespace Server.Engines.ConPVP } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Entry == null) { diff --git a/Projects/UOContent/Engines/Craft/Core/CraftGump.cs b/Projects/UOContent/Engines/Craft/Core/CraftGump.cs index bac1fa505..331dc4603 100644 --- a/Projects/UOContent/Engines/Craft/Core/CraftGump.cs +++ b/Projects/UOContent/Engines/Craft/Core/CraftGump.cs @@ -458,7 +458,7 @@ namespace Server.Engines.Craft } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID <= 0) { diff --git a/Projects/UOContent/Engines/Craft/Core/CraftGumpItem.cs b/Projects/UOContent/Engines/Craft/Core/CraftGumpItem.cs index ca87b5aa0..e016665f5 100644 --- a/Projects/UOContent/Engines/Craft/Core/CraftGumpItem.cs +++ b/Projects/UOContent/Engines/Craft/Core/CraftGumpItem.cs @@ -297,7 +297,7 @@ namespace Server.Engines.Craft } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { // Back Button if (info.ButtonID == 0) diff --git a/Projects/UOContent/Engines/Craft/Core/QueryMakersMarkGump.cs b/Projects/UOContent/Engines/Craft/Core/QueryMakersMarkGump.cs index 19313edac..dba819d19 100644 --- a/Projects/UOContent/Engines/Craft/Core/QueryMakersMarkGump.cs +++ b/Projects/UOContent/Engines/Craft/Core/QueryMakersMarkGump.cs @@ -42,7 +42,7 @@ namespace Server.Engines.Craft AddButton(20, 125, 4005, 4007, 0); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var makersMark = info.ButtonID == 1; diff --git a/Projects/UOContent/Engines/Factions/Gumps/ElectionGump.cs b/Projects/UOContent/Engines/Factions/Gumps/ElectionGump.cs index 20cf53d93..3305f1a60 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/ElectionGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/ElectionGump.cs @@ -100,7 +100,7 @@ namespace Server.Factions AddHtmlLocalized(55, 140, 350, 20, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { switch (info.ButtonID) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs b/Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs index d431f58c8..efdcc6036 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs @@ -161,7 +161,7 @@ namespace Server.Factions public static string FormatTimeSpan(TimeSpan ts) => $"{ts.Days:D2}:{ts.Hours % 24:D2}:{ts.Minutes % 60:D2}:{ts.Seconds % 60:D2}"; - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; var bid = info.ButtonID; diff --git a/Projects/UOContent/Engines/Factions/Gumps/FactionImbueGump.cs b/Projects/UOContent/Engines/Factions/Gumps/FactionImbueGump.cs index e8ffee06d..f8ac3742c 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/FactionImbueGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/FactionImbueGump.cs @@ -60,7 +60,7 @@ namespace Server.Factions AddButton(20, 230, 4005, 4007, 0); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/FactionStoneGump.cs b/Projects/UOContent/Engines/Factions/Gumps/FactionStoneGump.cs index 7467c5e07..1d10b8d27 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/FactionStoneGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/FactionStoneGump.cs @@ -259,7 +259,7 @@ namespace Server.Factions public override int ButtonTypes => 4; - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!FromButtonID(info.ButtonID, out var type, out var index)) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/FinanceGump.cs b/Projects/UOContent/Engines/Factions/Gumps/FinanceGump.cs index 81437f5b7..cf53e440f 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/FinanceGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/FinanceGump.cs @@ -165,7 +165,7 @@ namespace Server.Factions public override int ButtonTypes => 2; - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!m_Town.IsFinance(m_From) || m_Town.Owner != m_Faction) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/HorseBreederGump.cs b/Projects/UOContent/Engines/Factions/Gumps/HorseBreederGump.cs index 36e28c38f..130caa571 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/HorseBreederGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/HorseBreederGump.cs @@ -38,7 +38,7 @@ namespace Server.Factions AddButton(20, 240, 4005, 4007, 0); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 1) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/JoinStoneGump.cs b/Projects/UOContent/Engines/Factions/Gumps/JoinStoneGump.cs index b3580fec9..9e2b9a615 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/JoinStoneGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/JoinStoneGump.cs @@ -42,7 +42,7 @@ namespace Server.Factions AddHtmlLocalized(335, 400, 200, 20, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/LeaveFactionGump.cs b/Projects/UOContent/Engines/Factions/Gumps/LeaveFactionGump.cs index da19f1902..eacc61814 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/LeaveFactionGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/LeaveFactionGump.cs @@ -44,7 +44,7 @@ namespace Server.Factions AddButton(135, 80, 4005, 4007, 2); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { switch (info.ButtonID) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/SheriffGump.cs b/Projects/UOContent/Engines/Factions/Gumps/SheriffGump.cs index c8d290eaa..ea5c560a9 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/SheriffGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/SheriffGump.cs @@ -122,7 +122,7 @@ namespace Server.Factions AddItem(x + (w - rc.Width) / 2 - rc.X, y + (h - rc.Height) / 2 - rc.Y, itemID); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!m_Town.IsSheriff(m_From) || m_Town.Owner != m_Faction) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/TownStoneGump.cs b/Projects/UOContent/Engines/Factions/Gumps/TownStoneGump.cs index 4bd181106..8eada407d 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/TownStoneGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/TownStoneGump.cs @@ -40,7 +40,7 @@ namespace Server.Factions AddButton(20, 210, 4005, 4007, 0); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Town.Owner != m_Faction || !m_Faction.IsCommander(m_From)) { diff --git a/Projects/UOContent/Engines/Factions/Gumps/VoteGump.cs b/Projects/UOContent/Engines/Factions/Gumps/VoteGump.cs index c69676c08..7a0615457 100644 --- a/Projects/UOContent/Engines/Factions/Gumps/VoteGump.cs +++ b/Projects/UOContent/Engines/Factions/Gumps/VoteGump.cs @@ -49,7 +49,7 @@ namespace Server.Factions AddHtmlLocalized(55, 310, 100, 20, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0) { diff --git a/Projects/UOContent/Engines/Help/HelpGump.cs b/Projects/UOContent/Engines/Help/HelpGump.cs index 4d46a047b..41188a782 100644 --- a/Projects/UOContent/Engines/Help/HelpGump.cs +++ b/Projects/UOContent/Engines/Help/HelpGump.cs @@ -333,7 +333,7 @@ namespace Server.Engines.Help return false; } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; diff --git a/Projects/UOContent/Engines/Help/PagePromptGump.cs b/Projects/UOContent/Engines/Help/PagePromptGump.cs index 56028217a..42fc801b4 100644 --- a/Projects/UOContent/Engines/Help/PagePromptGump.cs +++ b/Projects/UOContent/Engines/Help/PagePromptGump.cs @@ -30,7 +30,7 @@ namespace Server.Engines.Help AddButton(405, 355, 2073, 2072, 0); // Cancel } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0) { @@ -38,8 +38,7 @@ namespace Server.Engines.Help } else { - var entry = info.GetTextEntry(0); - var text = entry?.Text.Trim() ?? ""; + var text = info.GetTextEntry(0)?.Trim() ?? ""; if (text.Length == 0) { diff --git a/Projects/UOContent/Engines/Help/PageQueueGump.cs b/Projects/UOContent/Engines/Help/PageQueueGump.cs index 878a546f5..4d7af15e0 100644 --- a/Projects/UOContent/Engines/Help/PageQueueGump.cs +++ b/Projects/UOContent/Engines/Help/PageQueueGump.cs @@ -40,7 +40,7 @@ namespace Server.Engines.Help AddHtmlLocalized(34, 28, 65, 24, 3001002, 0xFFFFFF); // Message } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { m_Mobile.SendGump(new PageResponseGump(m_Mobile, m_Name, m_Text)); @@ -112,7 +112,7 @@ namespace Server.Engines.Help } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID >= 1 && info.ButtonID <= m_List.Length) { @@ -350,7 +350,7 @@ namespace Server.Engines.Help AddTextEntry(x + 3, y + 1, w - 4, h - 2, 0x480, id, def); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_From.AccessLevel < AccessLevel.Administrator) { @@ -436,12 +436,7 @@ namespace Server.Engines.Help } case 2: { - var te = info.GetTextEntry(0); - - if (te != null) - { - m_Response.Title = te.Text; - } + m_Response.Title = info.GetTextEntry(0); PredefinedResponse.Save(); m_From.SendGump(new PredefGump(m_From, m_Response)); @@ -450,12 +445,7 @@ namespace Server.Engines.Help } case 3: { - var te = info.GetTextEntry(1); - - if (te != null) - { - m_Response.Message = te.Text; - } + m_Response.Message = info.GetTextEntry(1); PredefinedResponse.Save(); m_From.SendGump(new PredefGump(m_From, m_Response)); @@ -612,7 +602,7 @@ namespace Server.Engines.Help g.SendTo(state); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID != 0 && PageQueue.List.IndexOf(m_Entry) < 0) { @@ -799,7 +789,7 @@ namespace Server.Engines.Help if (text != null) // m_Entry.AddResponse(state.Mobile, "[Response] " + text.Text); { - m_Entry.Sender.SendGump(new MessageSentGump(m_Entry.Sender, state.Mobile.Name, text.Text)); + m_Entry.Sender.SendGump(new MessageSentGump(m_Entry.Sender, state.Mobile.Name, text)); } // m_Entry.Sender.SendMessage( 0x482, "{0} tells you:", state.Mobile.Name ); // m_Entry.Sender.SendMessage( 0x482, text.Text ); diff --git a/Projects/UOContent/Engines/Help/PageResponseGump.cs b/Projects/UOContent/Engines/Help/PageResponseGump.cs index d7e336d22..b1ff24011 100644 --- a/Projects/UOContent/Engines/Help/PageResponseGump.cs +++ b/Projects/UOContent/Engines/Help/PageResponseGump.cs @@ -31,7 +31,7 @@ namespace Server.Engines.Help AddButton(475, 417, 2073, 2072, 0); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 1) { diff --git a/Projects/UOContent/Engines/Help/SpeechLogGump.cs b/Projects/UOContent/Engines/Help/SpeechLogGump.cs index e82ced9a4..e9668a2a6 100644 --- a/Projects/UOContent/Engines/Help/SpeechLogGump.cs +++ b/Projects/UOContent/Engines/Help/SpeechLogGump.cs @@ -105,7 +105,7 @@ namespace Server.Engines.Help } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Engines/Help/StuckMenu.cs b/Projects/UOContent/Engines/Help/StuckMenu.cs index 130af5d44..20ebc62de 100644 --- a/Projects/UOContent/Engines/Help/StuckMenu.cs +++ b/Projects/UOContent/Engines/Help/StuckMenu.cs @@ -187,7 +187,7 @@ namespace Server.Menus.Questions m_Mobile.Frozen = false; } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { StopClose(); diff --git a/Projects/UOContent/Engines/Khaldun/PuzzleChest.cs b/Projects/UOContent/Engines/Khaldun/PuzzleChest.cs index 2bc0bee22..5de709331 100644 --- a/Projects/UOContent/Engines/Khaldun/PuzzleChest.cs +++ b/Projects/UOContent/Engines/Khaldun/PuzzleChest.cs @@ -737,7 +737,7 @@ namespace Server.Items } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Chest.Deleted || info.ButtonID == 0 || !m_From.CheckAlive()) { diff --git a/Projects/UOContent/Engines/ML Quests/Gumps/QuestCancelConfirmGump.cs b/Projects/UOContent/Engines/ML Quests/Gumps/QuestCancelConfirmGump.cs index f90a8ac57..152f7d7b1 100644 --- a/Projects/UOContent/Engines/ML Quests/Gumps/QuestCancelConfirmGump.cs +++ b/Projects/UOContent/Engines/ML Quests/Gumps/QuestCancelConfirmGump.cs @@ -76,7 +76,7 @@ namespace Server.Engines.MLQuests.Gumps AddButton(265, 220, 0xF7, 0xF8, 7); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Instance.Removed) { diff --git a/Projects/UOContent/Engines/ML Quests/Gumps/QuestLogDetailedGump.cs b/Projects/UOContent/Engines/ML Quests/Gumps/QuestLogDetailedGump.cs index 1ef2c7331..53bcb3c0e 100644 --- a/Projects/UOContent/Engines/ML Quests/Gumps/QuestLogDetailedGump.cs +++ b/Projects/UOContent/Engines/ML Quests/Gumps/QuestLogDetailedGump.cs @@ -44,7 +44,7 @@ namespace Server.Engines.MLQuests.Gumps AddRewardsPage(quest); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Instance.Removed) { diff --git a/Projects/UOContent/Engines/ML Quests/Gumps/QuestLogGump.cs b/Projects/UOContent/Engines/ML Quests/Gumps/QuestLogGump.cs index 4d4477ccc..cb957a8b0 100644 --- a/Projects/UOContent/Engines/ML Quests/Gumps/QuestLogGump.cs +++ b/Projects/UOContent/Engines/ML Quests/Gumps/QuestLogGump.cs @@ -63,7 +63,7 @@ namespace Server.Engines.MLQuests.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID < 6) { diff --git a/Projects/UOContent/Engines/ML Quests/Gumps/QuestOfferGump.cs b/Projects/UOContent/Engines/ML Quests/Gumps/QuestOfferGump.cs index 69e9e2376..85b6152b2 100644 --- a/Projects/UOContent/Engines/ML Quests/Gumps/QuestOfferGump.cs +++ b/Projects/UOContent/Engines/ML Quests/Gumps/QuestOfferGump.cs @@ -34,7 +34,7 @@ namespace Server.Engines.MLQuests.Gumps AddRewardsPage(quest); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (sender.Mobile is not PlayerMobile pm) { diff --git a/Projects/UOContent/Engines/ML Quests/Gumps/QuestReportBackGump.cs b/Projects/UOContent/Engines/ML Quests/Gumps/QuestReportBackGump.cs index e8592ab8d..d80a5dd72 100644 --- a/Projects/UOContent/Engines/ML Quests/Gumps/QuestReportBackGump.cs +++ b/Projects/UOContent/Engines/ML Quests/Gumps/QuestReportBackGump.cs @@ -28,7 +28,7 @@ namespace Server.Engines.MLQuests.Gumps AddConversation(quest.CompletionMessage); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 4) { diff --git a/Projects/UOContent/Engines/ML Quests/Gumps/QuestRewardGump.cs b/Projects/UOContent/Engines/ML Quests/Gumps/QuestRewardGump.cs index 646cc0664..8e917d8a4 100644 --- a/Projects/UOContent/Engines/ML Quests/Gumps/QuestRewardGump.cs +++ b/Projects/UOContent/Engines/ML Quests/Gumps/QuestRewardGump.cs @@ -26,7 +26,7 @@ namespace Server.Engines.MLQuests.Gumps AddRewards(quest); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Engines/ML Quests/Gumps/RaceChangeGump.cs b/Projects/UOContent/Engines/ML Quests/Gumps/RaceChangeGump.cs index 8bf71a510..667f56ca1 100644 --- a/Projects/UOContent/Engines/ML Quests/Gumps/RaceChangeGump.cs +++ b/Projects/UOContent/Engines/ML Quests/Gumps/RaceChangeGump.cs @@ -56,7 +56,7 @@ namespace Server.Engines.MLQuests.Gumps AddButton(90, 95, 0xF2, 0xF1, 0); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { switch (info.ButtonID) { diff --git a/Projects/UOContent/Engines/Plants/EmptyTheBowlGump.cs b/Projects/UOContent/Engines/Plants/EmptyTheBowlGump.cs index e127cb496..1447c7070 100644 --- a/Projects/UOContent/Engines/Plants/EmptyTheBowlGump.cs +++ b/Projects/UOContent/Engines/Plants/EmptyTheBowlGump.cs @@ -49,7 +49,7 @@ namespace Server.Engines.Plants } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Engines/Plants/MainPlantGump.cs b/Projects/UOContent/Engines/Plants/MainPlantGump.cs index 8b539a18d..136f8cc33 100644 --- a/Projects/UOContent/Engines/Plants/MainPlantGump.cs +++ b/Projects/UOContent/Engines/Plants/MainPlantGump.cs @@ -254,7 +254,7 @@ namespace Server.Engines.Plants } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Engines/Plants/ReproductionGump.cs b/Projects/UOContent/Engines/Plants/ReproductionGump.cs index cd65e1bd9..4feba68ac 100644 --- a/Projects/UOContent/Engines/Plants/ReproductionGump.cs +++ b/Projects/UOContent/Engines/Plants/ReproductionGump.cs @@ -125,7 +125,7 @@ namespace Server.Engines.Plants } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Engines/Plants/SetToDecorativeGump.cs b/Projects/UOContent/Engines/Plants/SetToDecorativeGump.cs index 6a9c2a337..f0bde3c0e 100644 --- a/Projects/UOContent/Engines/Plants/SetToDecorativeGump.cs +++ b/Projects/UOContent/Engines/Plants/SetToDecorativeGump.cs @@ -36,7 +36,7 @@ namespace Server.Engines.Plants AddItem(227, 118, 0xCF0); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs b/Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs index 24848f878..85f6b595e 100644 --- a/Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs +++ b/Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs @@ -133,7 +133,7 @@ public class ReportMurdererGump : Gump AddHtmlLocalized(400, 300, 300, 50, 1046363); // No } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = (PlayerMobile)state.Mobile; diff --git a/Projects/UOContent/Engines/Quests/Collector/Mobiles/Impresario.cs b/Projects/UOContent/Engines/Quests/Collector/Mobiles/Impresario.cs index ffb302232..efef0d89e 100644 --- a/Projects/UOContent/Engines/Quests/Collector/Mobiles/Impresario.cs +++ b/Projects/UOContent/Engines/Quests/Collector/Mobiles/Impresario.cs @@ -108,7 +108,7 @@ public class SheetMusicOfferGump : BaseQuestGump AddButton(340, 390, 0xF7, 0xF8, 1); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 1 || !info.IsSwitched(1)) { diff --git a/Projects/UOContent/Engines/Quests/Core/QuestConversation.cs b/Projects/UOContent/Engines/Quests/Core/QuestConversation.cs index 27b03814d..cf0baa192 100644 --- a/Projects/UOContent/Engines/Quests/Core/QuestConversation.cs +++ b/Projects/UOContent/Engines/Quests/Core/QuestConversation.cs @@ -121,7 +121,7 @@ namespace Server.Engines.Quests } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { for (var i = m_Conversations.Count - 1; i >= 0; --i) { diff --git a/Projects/UOContent/Engines/Quests/Core/QuestObjective.cs b/Projects/UOContent/Engines/Quests/Core/QuestObjective.cs index aedc5ce78..27fee278f 100644 --- a/Projects/UOContent/Engines/Quests/Core/QuestObjective.cs +++ b/Projects/UOContent/Engines/Quests/Core/QuestObjective.cs @@ -146,7 +146,7 @@ namespace Server.Engines.Quests AddButton(30, 15, 5575, 5576, 1); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { @@ -231,7 +231,7 @@ namespace Server.Engines.Quests } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { for (var i = m_Objectives.Count - 1; i >= 0; --i) { diff --git a/Projects/UOContent/Engines/Quests/Core/QuestSystem.cs b/Projects/UOContent/Engines/Quests/Core/QuestSystem.cs index 902414b81..6e805a471 100644 --- a/Projects/UOContent/Engines/Quests/Core/QuestSystem.cs +++ b/Projects/UOContent/Engines/Quests/Core/QuestSystem.cs @@ -591,7 +591,7 @@ namespace Server.Engines.Quests AddButton(265, 220, 247, 248, 1); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { @@ -654,7 +654,7 @@ namespace Server.Engines.Quests AddImage(379, 60, system.Picture); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Chyloth.cs b/Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Chyloth.cs index 6ce75937b..7eb7b6a90 100644 --- a/Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Chyloth.cs +++ b/Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Chyloth.cs @@ -300,7 +300,7 @@ public class ChylothPartyGump : Gump AddImageTiled(0, 0, 1, 217, 9155); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 2 && info.IsSwitched(1)) { diff --git a/Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs b/Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs index dc7a425c2..f5a4e81f8 100644 --- a/Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs +++ b/Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs @@ -76,7 +76,7 @@ public class SpawnPropsGump : PropertiesGump public static object GetPropValue(object src, string propName) => src.GetType().GetProperty(propName)?.GetValue(src, null); - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; diff --git a/Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs b/Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs index a1ecb8156..8440c5a65 100644 --- a/Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs +++ b/Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs @@ -399,7 +399,7 @@ public class SpawnerControllerGump : GumpGrid } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var buttonID = info.ButtonID - 1; var type = buttonID % TypeCount; @@ -427,9 +427,9 @@ public class SpawnerControllerGump : GumpGrid { var entry = info.GetTextEntry(0xFFFF); - if (entry?.Text?.Length > 0) + if (entry?.Length > 0) { - _search.SearchPattern = entry.Text; + _search.SearchPattern = entry; } } else if (index == 5 && _copy != null && _spawners?.Length > 0) @@ -500,27 +500,27 @@ public class SpawnerControllerGump : GumpGrid var indexEntry = index >= _lineCount ? (index - _lineCount * _page) * EntryCount : index * EntryCount; var name = info.GetTextEntry(indexEntry); - if (name?.Text.Length > 0) + if (name?.Length > 0) { - spawner.Name = name.Text; + spawner.Name = name; } - if (int.TryParse(info.GetTextEntry(indexEntry + 1)?.Text, out var walkRange)) + if (int.TryParse(info.GetTextEntry(indexEntry + 1), out var walkRange)) { spawner.WalkingRange = walkRange; } - if (int.TryParse(info.GetTextEntry(indexEntry + 2)?.Text, out var homeHange)) + if (int.TryParse(info.GetTextEntry(indexEntry + 2), out var homeHange)) { spawner.HomeRange = homeHange; } - if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 3)?.Text, out var minDelay)) + if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 3), out var minDelay)) { spawner.MinDelay = minDelay; } - if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 4)?.Text, out var maxDelay)) + if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 4), out var maxDelay)) { spawner.MaxDelay = maxDelay; } diff --git a/Projects/UOContent/Engines/Spawners/SpawnerGump.cs b/Projects/UOContent/Engines/Spawners/SpawnerGump.cs index a6611ce77..4c0e015c2 100644 --- a/Projects/UOContent/Engines/Spawners/SpawnerGump.cs +++ b/Projects/UOContent/Engines/Spawners/SpawnerGump.cs @@ -246,7 +246,7 @@ public class SpawnerGump : Gump continue; } - var str = cte.Text.Trim().ToLower(); + var str = cte.Trim().ToLower(); if (str.Length > 0) { @@ -267,12 +267,12 @@ public class SpawnerGump : Gump if (mte != null) { - entry.SpawnedMaxCount = Utility.ToInt32(mte.Text.Trim()); + entry.SpawnedMaxCount = Utility.ToInt32(mte.Trim()); } if (poste != null) { - entry.SpawnedProbability = Utility.ToInt32(poste.Text.Trim()); + entry.SpawnedProbability = Utility.ToInt32(poste.Trim()); } } else @@ -282,12 +282,12 @@ public class SpawnerGump : Gump if (mte != null) { - maxcount = Utility.ToInt32(mte.Text.Trim()); + maxcount = Utility.ToInt32(mte.Trim()); } if (poste != null) { - probcount = Utility.ToInt32(poste.Text.Trim()); + probcount = Utility.ToInt32(poste.Trim()); } entry = spawner.AddEntry(str, probcount, maxcount); @@ -295,12 +295,12 @@ public class SpawnerGump : Gump if (parmte != null) { - entry.Parameters = parmte.Text.Trim(); + entry.Parameters = parmte.Trim(); } if (propte != null) { - entry.Properties = propte.Text.Trim(); + entry.Properties = propte.Trim(); } } else if (entryindex < ocount && spawner.Entries[entryindex] != null) @@ -320,7 +320,7 @@ public class SpawnerGump : Gump } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (_spawner.Deleted) { diff --git a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/Gumps/CharacterStatueGump.cs b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/Gumps/CharacterStatueGump.cs index 427dd4ca3..87bc2d088 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/Gumps/CharacterStatueGump.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/Gumps/CharacterStatueGump.cs @@ -112,7 +112,7 @@ namespace Server.Gumps }; } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (m_Statue?.Deleted != false) { diff --git a/Projects/UOContent/Engines/Veteran Rewards/RewardChoiceGump.cs b/Projects/UOContent/Engines/Veteran Rewards/RewardChoiceGump.cs index c3f00bb8d..037aeaf01 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/RewardChoiceGump.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/RewardChoiceGump.cs @@ -176,7 +176,7 @@ namespace Server.Engines.VeteranRewards page += 1; } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var buttonID = info.ButtonID - 1; diff --git a/Projects/UOContent/Engines/Veteran Rewards/RewardConfirmGump.cs b/Projects/UOContent/Engines/Veteran Rewards/RewardConfirmGump.cs index 5be5067ef..5a9502a07 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/RewardConfirmGump.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/RewardConfirmGump.cs @@ -51,7 +51,7 @@ namespace Server.Engines.VeteranRewards AddHtmlLocalized(330, 266, 150, 35, 1006045); // Cancel } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Engines/Veteran Rewards/RewardDemolitionGump.cs b/Projects/UOContent/Engines/Veteran Rewards/RewardDemolitionGump.cs index d88dbf38f..a5cac8407 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/RewardDemolitionGump.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/RewardDemolitionGump.cs @@ -29,7 +29,7 @@ namespace Server.Gumps AddButton(20, 125, 0xFA5, 0xFA7, (int)Buttons.Cancel); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Addon is not Item item || item.Deleted) { diff --git a/Projects/UOContent/Engines/Veteran Rewards/RewardNoticeGump.cs b/Projects/UOContent/Engines/Veteran Rewards/RewardNoticeGump.cs index 78479500d..4c62a312a 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/RewardNoticeGump.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/RewardNoticeGump.cs @@ -29,7 +29,7 @@ namespace Server.Engines.VeteranRewards AddHtmlLocalized(320, 96, 150, 35, 1006045); // Cancel } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Engines/Veteran Rewards/RewardOptionGump.cs b/Projects/UOContent/Engines/Veteran Rewards/RewardOptionGump.cs index 8b4272d58..cd474c56b 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/RewardOptionGump.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/RewardOptionGump.cs @@ -49,7 +49,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Option != null && Contains(info.ButtonID)) { diff --git a/Projects/UOContent/Engines/Virtues/Justice.cs b/Projects/UOContent/Engines/Virtues/Justice.cs index c24017962..c3eb232d3 100644 --- a/Projects/UOContent/Engines/Virtues/Justice.cs +++ b/Projects/UOContent/Engines/Virtues/Justice.cs @@ -315,7 +315,7 @@ public class AcceptProtectorGump : Gump AddImageTiled(0, 0, 1, 217, 9155); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 2) { diff --git a/Projects/UOContent/Engines/Virtues/VirtueGump.cs b/Projects/UOContent/Engines/Virtues/VirtueGump.cs index 98179b464..4767447d7 100644 --- a/Projects/UOContent/Engines/Virtues/VirtueGump.cs +++ b/Projects/UOContent/Engines/Virtues/VirtueGump.cs @@ -137,7 +137,7 @@ public class VirtueGump : Gump return _table[index * 3 + vl]; } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 1 && _beholder == _beheld) { diff --git a/Projects/UOContent/Engines/Virtues/VirtueInfoGump.cs b/Projects/UOContent/Engines/Virtues/VirtueInfoGump.cs index 6e29a53df..ea76e26d6 100644 --- a/Projects/UOContent/Engines/Virtues/VirtueInfoGump.cs +++ b/Projects/UOContent/Engines/Virtues/VirtueInfoGump.cs @@ -107,7 +107,7 @@ public class VirtueInfoGump : Gump AddHtmlLocalized(83, 275, 400, 40, webPage == null ? 1052055 : 1052052); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { switch (info.ButtonID) { diff --git a/Projects/UOContent/Engines/Virtues/VirtueStatusGump.cs b/Projects/UOContent/Engines/Virtues/VirtueStatusGump.cs index 4cb927304..d673e62f9 100644 --- a/Projects/UOContent/Engines/Virtues/VirtueStatusGump.cs +++ b/Projects/UOContent/Engines/Virtues/VirtueStatusGump.cs @@ -62,7 +62,7 @@ public class VirtueStatusGump : Gump _ => 0 }; - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 9) { diff --git a/Projects/UOContent/Gumps/AddDoorGump.cs b/Projects/UOContent/Gumps/AddDoorGump.cs index 7865aef4d..b731ac97b 100644 --- a/Projects/UOContent/Gumps/AddDoorGump.cs +++ b/Projects/UOContent/Gumps/AddDoorGump.cs @@ -63,7 +63,7 @@ namespace Server.Gumps AddAlphaRegion(15, 14, width - 29, height - 29); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; var button = info.ButtonID - 1; diff --git a/Projects/UOContent/Gumps/AdminGump.cs b/Projects/UOContent/Gumps/AdminGump.cs index 66846478f..703622276 100644 --- a/Projects/UOContent/Gumps/AdminGump.cs +++ b/Projects/UOContent/Gumps/AdminGump.cs @@ -1910,7 +1910,7 @@ namespace Server.Gumps from.SendGump(new AdminGump(from, AdminGumpPage.AccountDetails_Access_ClientIPs, 0, null, notice, a)); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var val = info.ButtonID - 1; @@ -2219,7 +2219,7 @@ namespace Server.Gumps case 210: case 211: { - var text = info.GetTextEntry(0)?.Text.Trim(); + var text = info.GetTextEntry(0)?.Trim(); if (string.IsNullOrEmpty(text)) { @@ -2542,7 +2542,7 @@ namespace Server.Gumps var results = new List(); - var match = info.GetTextEntry(0)?.Text.Trim().ToLower(); + var match = info.GetTextEntry(0)?.Trim().ToLower(); string notice = null; if (string.IsNullOrEmpty(match)) @@ -2777,8 +2777,8 @@ namespace Server.Gumps } case 6: { - var un = info.GetTextEntry(0)?.Text.Trim(); - var pw = info.GetTextEntry(1)?.Text.Trim(); + var un = info.GetTextEntry(0)?.Trim(); + var pw = info.GetTextEntry(1)?.Trim(); Account dispAccount = null; string notice; @@ -2826,8 +2826,7 @@ namespace Server.Gumps { List results; - var matchEntry = info.GetTextEntry(0); - var match = matchEntry?.Text.Trim().ToLower(); + var match = info.GetTextEntry(0)?.Trim().ToLower(); if (string.IsNullOrEmpty(match)) { @@ -2944,11 +2943,8 @@ namespace Server.Gumps break; } - var passwordEntry = info.GetTextEntry(0); - var confirmEntry = info.GetTextEntry(1); - - var password = passwordEntry?.Text.Trim(); - var confirm = confirmEntry?.Text.Trim(); + var password = info.GetTextEntry(0)?.Trim(); + var confirm = info.GetTextEntry(1)?.Trim(); string notice; var page = AdminGumpPage.AccountDetails_ChangePassword; @@ -3136,8 +3132,7 @@ namespace Server.Gumps break; } - var entry = info.GetTextEntry(0); - var ip = entry?.Text.Trim(); + var ip = info.GetTextEntry(0)?.Trim(); string notice; @@ -3632,8 +3627,7 @@ namespace Server.Gumps { case 0: { - var matchEntry = info.GetTextEntry(0); - var match = matchEntry?.Text.Trim(); + var match = info.GetTextEntry(0)?.Trim(); string notice = null; var results = new List(); @@ -3699,8 +3693,7 @@ namespace Server.Gumps } case 1: { - var relay = info.GetTextEntry(0); - var text = relay?.Text.Trim(); + var text = info.GetTextEntry(0)?.Trim(); if (string.IsNullOrEmpty(text)) { diff --git a/Projects/UOContent/Gumps/BanDurationGump.cs b/Projects/UOContent/Gumps/BanDurationGump.cs index ffa6c74f5..dc2bb9e3b 100644 --- a/Projects/UOContent/Gumps/BanDurationGump.cs +++ b/Projects/UOContent/Gumps/BanDurationGump.cs @@ -64,7 +64,7 @@ namespace Server.Gumps AddTextField(x + 35, y + 20, 100, 20, idx); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; @@ -110,10 +110,10 @@ namespace Server.Gumps try { duration = new TimeSpan( - Utility.ToInt32(d.Text), - Utility.ToInt32(h.Text), - Utility.ToInt32(m.Text), - Utility.ToInt32(s.Text) + Utility.ToInt32(d), + Utility.ToInt32(h), + Utility.ToInt32(m), + Utility.ToInt32(s) ); shouldSet = true; @@ -136,7 +136,7 @@ namespace Server.Gumps { try { - duration = TimeSpan.FromDays(Utility.ToDouble(d.Text)); + duration = TimeSpan.FromDays(Utility.ToDouble(d)); shouldSet = true; break; @@ -158,7 +158,7 @@ namespace Server.Gumps { try { - duration = TimeSpan.FromHours(Utility.ToDouble(h.Text)); + duration = TimeSpan.FromHours(Utility.ToDouble(h)); shouldSet = true; break; @@ -180,7 +180,7 @@ namespace Server.Gumps { try { - duration = TimeSpan.FromMinutes(Utility.ToDouble(m.Text)); + duration = TimeSpan.FromMinutes(Utility.ToDouble(m)); shouldSet = true; break; @@ -202,7 +202,7 @@ namespace Server.Gumps { try { - duration = TimeSpan.FromSeconds(Utility.ToDouble(s.Text)); + duration = TimeSpan.FromSeconds(Utility.ToDouble(s)); shouldSet = true; break; @@ -223,7 +223,7 @@ namespace Server.Gumps if (shouldSet) { - var comment = c?.Text.Trim().DefaultIfNullOrEmpty(null); + var comment = c?.Trim().DefaultIfNullOrEmpty(null); for (var i = 0; i < m_List.Count; ++i) { diff --git a/Projects/UOContent/Gumps/BaseConfirmGump.cs b/Projects/UOContent/Gumps/BaseConfirmGump.cs index 944e09a79..c7506c088 100644 --- a/Projects/UOContent/Gumps/BaseConfirmGump.cs +++ b/Projects/UOContent/Gumps/BaseConfirmGump.cs @@ -50,7 +50,7 @@ namespace Server.Gumps public virtual int LabelNumber // Are you sure you wish to select this? => 1074975; - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == (int)Buttons.Confirm) { diff --git a/Projects/UOContent/Gumps/BaseImageTileButtonsGump.cs b/Projects/UOContent/Gumps/BaseImageTileButtonsGump.cs index f18be777a..6309ecbce 100644 --- a/Projects/UOContent/Gumps/BaseImageTileButtonsGump.cs +++ b/Projects/UOContent/Gumps/BaseImageTileButtonsGump.cs @@ -121,7 +121,7 @@ namespace Server.Gumps protected virtual int XItems => 2; protected virtual int YItems => 5; - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var adjustedID = info.ButtonID - 100; diff --git a/Projects/UOContent/Gumps/ClientGump.cs b/Projects/UOContent/Gumps/ClientGump.cs index 28cb10b80..473753acf 100644 --- a/Projects/UOContent/Gumps/ClientGump.cs +++ b/Projects/UOContent/Gumps/ClientGump.cs @@ -139,12 +139,10 @@ namespace Server.Gumps private void Resend(Mobile to, RelayInfo info) { - var te = info.GetTextEntry(0); - - to.SendGump(new ClientGump(to, m_State, te == null ? "" : te.Text)); + to.SendGump(new ClientGump(to, m_State, info.GetTextEntry(0) ?? "")); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (m_State == null) { @@ -177,16 +175,16 @@ namespace Server.Gumps { case 1: // Tell { - var text = info.GetTextEntry(0); + var text = info.GetTextEntry(0)?.Trim(); - if (text != null) + if (text?.Length > 0) { focus.SendMessage(0x482, $"{from.Name} tells you:"); - focus.SendMessage(0x482, text.Text); + focus.SendMessage(0x482, text); CommandLogging.WriteLine( from, - $"{from.AccessLevel} {CommandLogging.Format(from)} telling {CommandLogging.Format(focus)} \"{text.Text}\"" + $"{from.AccessLevel} {CommandLogging.Format(from)} telling {CommandLogging.Format(focus)} \"{text}\"" ); } diff --git a/Projects/UOContent/Gumps/CommentsGump.cs b/Projects/UOContent/Gumps/CommentsGump.cs index c795d5e38..329ca2ca7 100644 --- a/Projects/UOContent/Gumps/CommentsGump.cs +++ b/Projects/UOContent/Gumps/CommentsGump.cs @@ -87,7 +87,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 0x7F) { diff --git a/Projects/UOContent/Gumps/ConfirmHeritageGump.cs b/Projects/UOContent/Gumps/ConfirmHeritageGump.cs index 3ea29bb5f..eb2aa4bc5 100644 --- a/Projects/UOContent/Gumps/ConfirmHeritageGump.cs +++ b/Projects/UOContent/Gumps/ConfirmHeritageGump.cs @@ -28,7 +28,7 @@ namespace Server.Gumps AddHtmlLocalized(40, 75, 100, 20, 1060051, 0x7FFF); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Token?.Deleted != false) { diff --git a/Projects/UOContent/Gumps/ConfirmHouseResize.cs b/Projects/UOContent/Gumps/ConfirmHouseResize.cs index caf8f78f0..1cebbe6f8 100644 --- a/Projects/UOContent/Gumps/ConfirmHouseResize.cs +++ b/Projects/UOContent/Gumps/ConfirmHouseResize.cs @@ -46,7 +46,7 @@ namespace Server.Gumps AddHtmlLocalized(240, 250, 170, 20, 1011012, 0x7FFF); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 1 && !m_House.Deleted) { diff --git a/Projects/UOContent/Gumps/ConfirmReleaseGump.cs b/Projects/UOContent/Gumps/ConfirmReleaseGump.cs index 862f49f7d..a65482f4c 100644 --- a/Projects/UOContent/Gumps/ConfirmReleaseGump.cs +++ b/Projects/UOContent/Gumps/ConfirmReleaseGump.cs @@ -29,7 +29,7 @@ namespace Server.Gumps AddHtmlLocalized(170, 80, 75, 20, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 2 || m_Pet.Deleted || !(m_Pet.Controlled && m_From == m_Pet.ControlMaster && diff --git a/Projects/UOContent/Gumps/Go/GoGump.cs b/Projects/UOContent/Gumps/Go/GoGump.cs index 61db1a9e9..30f152a92 100644 --- a/Projects/UOContent/Gumps/Go/GoGump.cs +++ b/Projects/UOContent/Gumps/Go/GoGump.cs @@ -207,7 +207,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; diff --git a/Projects/UOContent/Gumps/Guilds/DeclareFealtyGump.cs b/Projects/UOContent/Gumps/Guilds/DeclareFealtyGump.cs index a51e80334..249027dcf 100644 --- a/Projects/UOContent/Gumps/Guilds/DeclareFealtyGump.cs +++ b/Projects/UOContent/Gumps/Guilds/DeclareFealtyGump.cs @@ -20,7 +20,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadMember(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GrantGuildTitleGump.cs b/Projects/UOContent/Gumps/Guilds/GrantGuildTitleGump.cs index 88e901a57..063d1fec1 100644 --- a/Projects/UOContent/Gumps/Guilds/GrantGuildTitleGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GrantGuildTitleGump.cs @@ -20,7 +20,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildAcceptWarGump.cs b/Projects/UOContent/Gumps/Guilds/GuildAcceptWarGump.cs index 3ea2d8986..a32c1543a 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildAcceptWarGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildAcceptWarGump.cs @@ -20,7 +20,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildAdminCandidatesGump.cs b/Projects/UOContent/Gumps/Guilds/GuildAdminCandidatesGump.cs index 447c42944..f9816e2a3 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildAdminCandidatesGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildAdminCandidatesGump.cs @@ -21,7 +21,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1013077); // Refuse } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildCandidatesGump.cs b/Projects/UOContent/Gumps/Guilds/GuildCandidatesGump.cs index 10b642c59..5d475239e 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildCandidatesGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildCandidatesGump.cs @@ -17,7 +17,7 @@ namespace Server.Gumps AddHtmlLocalized(55, 400, 300, 35, 1011120); // Return to the main menu. } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadMember(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildChangeTypeGump.cs b/Projects/UOContent/Gumps/Guilds/GuildChangeTypeGump.cs index 0867310be..24d8b5883 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildChangeTypeGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildChangeTypeGump.cs @@ -40,7 +40,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 360, 150, 30, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (Guild.NewGuildSystem && !BaseGuildGump.IsLeader(m_Mobile, m_Guild) || !Guild.NewGuildSystem && GuildGump.BadLeader(m_Mobile, m_Guild)) diff --git a/Projects/UOContent/Gumps/Guilds/GuildCharterGump.cs b/Projects/UOContent/Gumps/Guilds/GuildCharterGump.cs index f297a9a61..ee197c41f 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildCharterGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildCharterGump.cs @@ -47,7 +47,7 @@ namespace Server.Gumps AddHtml(55, 220, 300, 20, website); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadMember(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildDeclarePeaceGump.cs b/Projects/UOContent/Gumps/Guilds/GuildDeclarePeaceGump.cs index 6a43dbb20..6f317baee 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildDeclarePeaceGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildDeclarePeaceGump.cs @@ -20,7 +20,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildDeclareWarGump.cs b/Projects/UOContent/Gumps/Guilds/GuildDeclareWarGump.cs index 135ffe9da..a99526e21 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildDeclareWarGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildDeclareWarGump.cs @@ -23,7 +23,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildDismissGump.cs b/Projects/UOContent/Gumps/Guilds/GuildDismissGump.cs index fa3a0021a..a95d9659d 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildDismissGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildDismissGump.cs @@ -20,7 +20,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildGump.cs b/Projects/UOContent/Gumps/Guilds/GuildGump.cs index cfbe72cb1..fff700886 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildGump.cs @@ -139,7 +139,7 @@ namespace Server.Gumps return stone?.Deleted != false || !m.InRange(stone.GetWorldLocation(), 2); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (BadMember(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildRejectWarGump.cs b/Projects/UOContent/Gumps/Guilds/GuildRejectWarGump.cs index 9fb2b9565..4199fa3e8 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildRejectWarGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildRejectWarGump.cs @@ -20,7 +20,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildRescindDeclarationGump.cs b/Projects/UOContent/Gumps/Guilds/GuildRescindDeclarationGump.cs index b922c5e79..37fb37e12 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildRescindDeclarationGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildRescindDeclarationGump.cs @@ -20,7 +20,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 400, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildRosterGump.cs b/Projects/UOContent/Gumps/Guilds/GuildRosterGump.cs index 173baff84..0122bacf8 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildRosterGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildRosterGump.cs @@ -17,7 +17,7 @@ namespace Server.Gumps AddHtmlLocalized(55, 400, 300, 35, 1011120); // Return to the main menu. } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadMember(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildWarAdminGump.cs b/Projects/UOContent/Gumps/Guilds/GuildWarAdminGump.cs index 6112477ca..0046d23d8 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildWarAdminGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildWarAdminGump.cs @@ -63,7 +63,7 @@ namespace Server.Gumps AddHtmlLocalized(55, 400, 400, 35, 1011104); // Return to the previous menu. } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildWarGump.cs b/Projects/UOContent/Gumps/Guilds/GuildWarGump.cs index 3b3acb359..b11c7bee8 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildWarGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildWarGump.cs @@ -97,7 +97,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadMember(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildmasterGump.cs b/Projects/UOContent/Gumps/Guilds/GuildmasterGump.cs index ae88b6895..332a3d396 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildmasterGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildmasterGump.cs @@ -82,7 +82,7 @@ namespace Server.Gumps AddHtmlLocalized(335, 360, 100, 30, 1011441); // EXIT } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (GuildGump.BadLeader(m_Mobile, m_Guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/AdvancedSearch.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/AdvancedSearch.cs index dfbfea16e..1f544881a 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/AdvancedSearch.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/AdvancedSearch.cs @@ -52,7 +52,7 @@ namespace Server.Guilds AddHtmlLocalized(370, 373, 60, 26, 1006045, 0x0); // Cancel } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { base.OnResponse(sender, info); diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildGump.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildGump.cs index 7c8052025..cb3222c55 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildGump.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildGump.cs @@ -38,7 +38,7 @@ namespace Server.Guilds AddPage(1); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (sender.Mobile is not PlayerMobile pm) { diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildListGump.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildListGump.cs index f157ea4c9..8affb0cad 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildListGump.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildListGump.cs @@ -160,7 +160,7 @@ namespace Server.Guilds protected abstract TextDefinition[] GetValuesFor(T o, int aryLength); protected abstract bool IsFiltered(T o, string filter); - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { base.OnResponse(sender, info); @@ -176,7 +176,7 @@ namespace Server.Guilds case 5: // Filter { var t = info.GetTextEntry(1); - pm.SendGump(GetResentGump(player, guild, m_Comparer, m_Ascending, t == null ? "" : t.Text, 0)); + pm.SendGump(GetResentGump(player, guild, m_Comparer, m_Ascending, t ?? "", 0)); break; } case 6: // Back diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/CreateGuildGump.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/CreateGuildGump.cs index 968ac5337..5d6729e97 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/CreateGuildGump.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/CreateGuildGump.cs @@ -42,7 +42,7 @@ namespace Server.Guilds AddHtmlLocalized(45, 260, 200, 30, 1062943, 0x0); // Ignore Guild Invites } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (sender.Mobile is not PlayerMobile { Guild: null } pm) { @@ -53,14 +53,8 @@ namespace Server.Guilds { case 1: { - var tName = info.GetTextEntry(5); - var tAbbrev = info.GetTextEntry(6); - - var guildName = tName?.Text?.Trim() ?? ""; - var guildAbbrev = tAbbrev?.Text?.Trim() ?? ""; - - guildName = Utility.FixHtml(guildName); - guildAbbrev = Utility.FixHtml(guildAbbrev); + var guildName = Utility.FixHtml(info.GetTextEntry(5) ?? ""); + var guildAbbrev = Utility.FixHtml(info.GetTextEntry(6) ?? ""); if (guildName.Length <= 0) { diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/DiplomacyGump.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/DiplomacyGump.cs index 79e11341d..0402086e3 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/DiplomacyGump.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/DiplomacyGump.cs @@ -236,7 +236,7 @@ namespace Server.Guilds return new OtherGuildInfo(pm, g, o); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { base.OnResponse(sender, info); diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/GuildInfoGump.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/GuildInfoGump.cs index 2315edd33..c9f146e70 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/GuildInfoGump.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/GuildInfoGump.cs @@ -84,7 +84,7 @@ namespace Server.Guilds AddHtmlLocalized(480, 373, 60, 26, 3006115, m_IsResigning ? 0x5000 : 0); // Resign } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { base.OnResponse(sender, info); diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/GuildInvitationRequest.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/GuildInvitationRequest.cs index 26417765d..6c7922fd6 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/GuildInvitationRequest.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/GuildInvitationRequest.cs @@ -36,7 +36,7 @@ namespace Server.Guilds AddHtmlLocalized(45, 130, 150, 30, 1062943, 0x0); // Ignore Guild Invites } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (guild.Disbanded || player.Guild != null) { diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs index 593baa9d1..1271b3410 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs @@ -66,7 +66,7 @@ namespace Server.Guilds AddHtmlLocalized(210, 213, 110, 26, 1062997, m_toKick ? 0x5000 : 0); // Kick } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (sender.Mobile is not PlayerMobile pm || !IsMember(pm, guild) || !IsMember(m_Member, guild)) { diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/GuildRosterGump.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/GuildRosterGump.cs index b8cc54a81..f5bb56ccb 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/GuildRosterGump.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/GuildRosterGump.cs @@ -95,7 +95,7 @@ namespace Server.Guilds public override Gump GetObjectInfoGump(PlayerMobile pm, Guild g, PlayerMobile o) => new GuildMemberInfoGump(pm, g, o, false, false); - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { base.OnResponse(sender, info); diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/OtherGuildInfo.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/OtherGuildInfo.cs index b833dceb4..23abda5b5 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/OtherGuildInfo.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/OtherGuildInfo.cs @@ -187,7 +187,7 @@ namespace Server.Guilds AddImageTiled(20, 245, 480, 2, 0x2711); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!(sender.Mobile is PlayerMobile pm && IsMember(pm, guild))) { diff --git a/Projects/UOContent/Gumps/Guilds/New Guild System/WarDeclarationGump.cs b/Projects/UOContent/Gumps/Guilds/New Guild System/WarDeclarationGump.cs index 04a992aef..b0a5749ae 100644 --- a/Projects/UOContent/Gumps/Guilds/New Guild System/WarDeclarationGump.cs +++ b/Projects/UOContent/Gumps/Guilds/New Guild System/WarDeclarationGump.cs @@ -36,7 +36,7 @@ namespace Server.Guilds AddHtmlLocalized(360, 273, 90, 26, 1062989, 0x5000); // Declare War! } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var pm = sender.Mobile as PlayerMobile; @@ -95,11 +95,11 @@ namespace Server.Guilds var maxKills = tKills == null ? 0 - : Math.Clamp(Utility.ToInt32(info.GetTextEntry(11).Text), 0, 0xFFFF); + : Math.Clamp(Utility.ToInt32(tKills), 0, 0xFFFF); var warLength = TimeSpan.FromHours( tWarLength == null ? 0 - : Math.Clamp(Utility.ToInt32(info.GetTextEntry(10).Text), 0, 0xFFFF) + : Math.Clamp(Utility.ToInt32(tWarLength), 0, 0xFFFF) ); if (war != null) diff --git a/Projects/UOContent/Gumps/HeritageTokenGump.cs b/Projects/UOContent/Gumps/HeritageTokenGump.cs index bd1dc0123..98347828c 100644 --- a/Projects/UOContent/Gumps/HeritageTokenGump.cs +++ b/Projects/UOContent/Gumps/HeritageTokenGump.cs @@ -270,7 +270,7 @@ namespace Server.Gumps AddHtmlLocalized(98, 236, 250, 60, 1076786, 0x7FFF); // Peach Trunk } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Token?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Gumps/HonorSelf.cs b/Projects/UOContent/Gumps/HonorSelf.cs index 9a60b2440..641d15eb6 100644 --- a/Projects/UOContent/Gumps/HonorSelf.cs +++ b/Projects/UOContent/Gumps/HonorSelf.cs @@ -17,7 +17,7 @@ namespace Server.Gumps AddHtml(21, 20, 203, 70, "Are you sure you want to use honor points on yourself?", true); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Gumps/HouseDemolishGump.cs b/Projects/UOContent/Gumps/HouseDemolishGump.cs index ace02a51d..f8278a0e4 100644 --- a/Projects/UOContent/Gumps/HouseDemolishGump.cs +++ b/Projects/UOContent/Gumps/HouseDemolishGump.cs @@ -51,7 +51,7 @@ namespace Server.Gumps AddHtmlLocalized(240, 250, 170, 20, 1011012, 32767); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 1 && !m_House.Deleted) { diff --git a/Projects/UOContent/Gumps/HouseGump.cs b/Projects/UOContent/Gumps/HouseGump.cs index 89cf0ea01..da4dcefa5 100644 --- a/Projects/UOContent/Gumps/HouseGump.cs +++ b/Projects/UOContent/Gumps/HouseGump.cs @@ -71,7 +71,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (m_House.Deleted) { @@ -162,7 +162,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (m_House.Deleted) { @@ -421,7 +421,7 @@ namespace Server.Gumps return name; } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_House.Deleted) { diff --git a/Projects/UOContent/Gumps/HouseGumpAOS.cs b/Projects/UOContent/Gumps/HouseGumpAOS.cs index e1308d94b..ddc22c886 100644 --- a/Projects/UOContent/Gumps/HouseGumpAOS.cs +++ b/Projects/UOContent/Gumps/HouseGumpAOS.cs @@ -911,7 +911,7 @@ namespace Server.Gumps from.SendGump(new HouseGumpAOS(HouseGumpPageAOS.Security, from, house)); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_House.Deleted) { diff --git a/Projects/UOContent/Gumps/HouseTransferGump.cs b/Projects/UOContent/Gumps/HouseTransferGump.cs index 5e744a338..25a69423e 100644 --- a/Projects/UOContent/Gumps/HouseTransferGump.cs +++ b/Projects/UOContent/Gumps/HouseTransferGump.cs @@ -54,7 +54,7 @@ namespace Server.Gumps AddHtmlLocalized(240, 250, 170, 20, 1011012, 32767); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 1 && !m_House.Deleted) { diff --git a/Projects/UOContent/Gumps/NoticeGump.cs b/Projects/UOContent/Gumps/NoticeGump.cs index eb10a69a0..a416dbdf3 100644 --- a/Projects/UOContent/Gumps/NoticeGump.cs +++ b/Projects/UOContent/Gumps/NoticeGump.cs @@ -54,7 +54,7 @@ namespace Server.Gumps AddHtmlLocalized(40, height - 30, 120, 20, 1011036, 32767); // OKAY } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Gumps/PetResurrectGump.cs b/Projects/UOContent/Gumps/PetResurrectGump.cs index 244ee121c..8e7dc4068 100644 --- a/Projects/UOContent/Gumps/PetResurrectGump.cs +++ b/Projects/UOContent/Gumps/PetResurrectGump.cs @@ -33,7 +33,7 @@ namespace Server.Gumps AddButton(110, 105, 0x819, 0x818, 0x2); // Cancel } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (m_Pet.Deleted || !m_Pet.IsBonded || !m_Pet.IsDeadPet) { diff --git a/Projects/UOContent/Gumps/PlayerVendorGumps.cs b/Projects/UOContent/Gumps/PlayerVendorGumps.cs index 14ea7e76b..6484845e6 100644 --- a/Projects/UOContent/Gumps/PlayerVendorGumps.cs +++ b/Projects/UOContent/Gumps/PlayerVendorGumps.cs @@ -41,7 +41,7 @@ namespace Server.Gumps AddHtmlLocalized(152, 130, 100, 24, 1011036); // OKAY } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; @@ -147,7 +147,7 @@ namespace Server.Gumps AddLabel(300, 48, 0, ((int)(days / 12.0)).ToString()); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; @@ -256,7 +256,7 @@ namespace Server.Gumps AddHtmlLocalized(408, 161, 120, 20, 1011012, 0x7FFF); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; @@ -555,7 +555,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (m_Vendor.Deleted) { @@ -1003,7 +1003,7 @@ namespace Server.Gumps AddHtmlLocalized(45, 342, 305, 18, 1060675, 0x7FFF); // CLOSE } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Gumps/PolymorphGump.cs b/Projects/UOContent/Gumps/PolymorphGump.cs index 8fc84dfed..70f471347 100644 --- a/Projects/UOContent/Gumps/PolymorphGump.cs +++ b/Projects/UOContent/Gumps/PolymorphGump.cs @@ -121,7 +121,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 1 && info.Switches.Length > 0) { @@ -231,7 +231,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var idx = info.ButtonID - 1; diff --git a/Projects/UOContent/Gumps/Props/PropsGump.cs b/Projects/UOContent/Gumps/Props/PropsGump.cs index 5867f6811..c3377f3a0 100644 --- a/Projects/UOContent/Gumps/Props/PropsGump.cs +++ b/Projects/UOContent/Gumps/Props/PropsGump.cs @@ -235,7 +235,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; diff --git a/Projects/UOContent/Gumps/Props/SetCustomEnumGump.cs b/Projects/UOContent/Gumps/Props/SetCustomEnumGump.cs index 9c422aa1f..fdae82471 100644 --- a/Projects/UOContent/Gumps/Props/SetCustomEnumGump.cs +++ b/Projects/UOContent/Gumps/Props/SetCustomEnumGump.cs @@ -15,7 +15,7 @@ namespace Server.Gumps ) : base(prop, mobile, o, propertiesGump, names, null) => m_Names = names; - public override void OnResponse(NetState sender, RelayInfo relayInfo) + public override void OnResponse(NetState sender, in RelayInfo relayInfo) { var from = sender.Mobile; diff --git a/Projects/UOContent/Gumps/Props/SetGump.cs b/Projects/UOContent/Gumps/Props/SetGump.cs index e543c3a4a..dfe6a57b6 100644 --- a/Projects/UOContent/Gumps/Props/SetGump.cs +++ b/Projects/UOContent/Gumps/Props/SetGump.cs @@ -117,7 +117,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { object toSet = null; bool shouldSet, shouldSend = true; @@ -126,13 +126,13 @@ namespace Server.Gumps { case 1: { - var text = info.GetTextEntry(0); + var text = info.GetTextEntry(0)?.Trim(); - if (text != null) + if (text?.Length > 0) { try { - Types.TryParse(m_Property.PropertyType, text.Text, out toSet); + Types.TryParse(m_Property.PropertyType, text, out toSet); shouldSet = true; } catch diff --git a/Projects/UOContent/Gumps/Props/SetListOptionGump.cs b/Projects/UOContent/Gumps/Props/SetListOptionGump.cs index 4f714aadf..2203a5bfc 100644 --- a/Projects/UOContent/Gumps/Props/SetListOptionGump.cs +++ b/Projects/UOContent/Gumps/Props/SetListOptionGump.cs @@ -163,7 +163,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Gumps/Props/SetObjectGump.cs b/Projects/UOContent/Gumps/Props/SetObjectGump.cs index a25fb17ff..326370aec 100644 --- a/Projects/UOContent/Gumps/Props/SetObjectGump.cs +++ b/Projects/UOContent/Gumps/Props/SetObjectGump.cs @@ -116,7 +116,7 @@ namespace Server.Gumps AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 4); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var shouldSend = true; object viewProps = null; diff --git a/Projects/UOContent/Gumps/Props/SetPoint2DGump.cs b/Projects/UOContent/Gumps/Props/SetPoint2DGump.cs index b3e099853..a9703fe1e 100644 --- a/Projects/UOContent/Gumps/Props/SetPoint2DGump.cs +++ b/Projects/UOContent/Gumps/Props/SetPoint2DGump.cs @@ -106,7 +106,7 @@ namespace Server.Gumps AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { Point2D toSet; bool shouldSet, shouldSend; @@ -133,12 +133,9 @@ namespace Server.Gumps } case 3: // Use values { - var x = info.GetTextEntry(0); - var y = info.GetTextEntry(1); - toSet = new Point2D( - x == null ? 0 : Utility.ToInt32(x.Text), - y == null ? 0 : Utility.ToInt32(y.Text) + Utility.ToInt32(info.GetTextEntry(0)), + Utility.ToInt32(info.GetTextEntry(1)) ); shouldSet = true; shouldSend = true; diff --git a/Projects/UOContent/Gumps/Props/SetPoint3DGump.cs b/Projects/UOContent/Gumps/Props/SetPoint3DGump.cs index 616cf0b6b..fed371935 100644 --- a/Projects/UOContent/Gumps/Props/SetPoint3DGump.cs +++ b/Projects/UOContent/Gumps/Props/SetPoint3DGump.cs @@ -112,7 +112,7 @@ namespace Server.Gumps AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { Point3D toSet; bool shouldSet, shouldSend; @@ -139,14 +139,10 @@ namespace Server.Gumps } case 3: // Use values { - var x = info.GetTextEntry(0); - var y = info.GetTextEntry(1); - var z = info.GetTextEntry(2); - toSet = new Point3D( - x == null ? 0 : Utility.ToInt32(x.Text), - y == null ? 0 : Utility.ToInt32(y.Text), - z == null ? 0 : Utility.ToInt32(z.Text) + Utility.ToInt32(info.GetTextEntry(0)), + Utility.ToInt32(info.GetTextEntry(1)), + Utility.ToInt32(info.GetTextEntry(2)) ); shouldSet = true; shouldSend = true; diff --git a/Projects/UOContent/Gumps/Props/SetTimeSpanGump.cs b/Projects/UOContent/Gumps/Props/SetTimeSpanGump.cs index 22ed96189..e45a1eae5 100644 --- a/Projects/UOContent/Gumps/Props/SetTimeSpanGump.cs +++ b/Projects/UOContent/Gumps/Props/SetTimeSpanGump.cs @@ -79,7 +79,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { TimeSpan toSet; bool shouldSet, shouldSend; @@ -103,7 +103,7 @@ namespace Server.Gumps var successfulParse = false; if (h != null && m != null && s != null) { - successfulParse = TimeSpan.TryParse($"{h.Text}:{m.Text}:{s.Text}", out toSet); + successfulParse = TimeSpan.TryParse($"{h}:{m}:{s}", out toSet); } else { @@ -120,7 +120,7 @@ namespace Server.Gumps { try { - toSet = TimeSpan.FromHours(Utility.ToDouble(h.Text)); + toSet = TimeSpan.FromHours(Utility.ToDouble(h)); shouldSet = true; shouldSend = true; @@ -144,7 +144,7 @@ namespace Server.Gumps { try { - toSet = TimeSpan.FromMinutes(Utility.ToDouble(m.Text)); + toSet = TimeSpan.FromMinutes(Utility.ToDouble(m)); shouldSet = true; shouldSend = true; @@ -168,7 +168,7 @@ namespace Server.Gumps { try { - toSet = TimeSpan.FromSeconds(Utility.ToDouble(s.Text)); + toSet = TimeSpan.FromSeconds(Utility.ToDouble(s)); shouldSet = true; shouldSend = true; diff --git a/Projects/UOContent/Gumps/ReclaimVendorGump.cs b/Projects/UOContent/Gumps/ReclaimVendorGump.cs index 938a155a1..48f7b1d77 100644 --- a/Projects/UOContent/Gumps/ReclaimVendorGump.cs +++ b/Projects/UOContent/Gumps/ReclaimVendorGump.cs @@ -33,7 +33,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Gumps/ResurrectGump.cs b/Projects/UOContent/Gumps/ResurrectGump.cs index 86267020e..f3c1322b9 100644 --- a/Projects/UOContent/Gumps/ResurrectGump.cs +++ b/Projects/UOContent/Gumps/ResurrectGump.cs @@ -122,7 +122,7 @@ namespace Server.Gumps AddImageTiled(0, 0, 1, 217, 9155); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; diff --git a/Projects/UOContent/Gumps/RewardGump.cs b/Projects/UOContent/Gumps/RewardGump.cs index 7c26a804b..c5d401452 100644 --- a/Projects/UOContent/Gumps/RewardGump.cs +++ b/Projects/UOContent/Gumps/RewardGump.cs @@ -124,7 +124,7 @@ namespace Server.Gumps public RewardPickedHandler OnPicked { get; } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var choice = info.ButtonID; @@ -198,7 +198,7 @@ namespace Server.Gumps AddButton(265, 220, 0xF7, 0xF8, 7); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 7 && info.IsSwitched(1)) { diff --git a/Projects/UOContent/Gumps/RunebookGump.cs b/Projects/UOContent/Gumps/RunebookGump.cs index 8e95372d8..104f17398 100644 --- a/Projects/UOContent/Gumps/RunebookGump.cs +++ b/Projects/UOContent/Gumps/RunebookGump.cs @@ -228,7 +228,7 @@ namespace Server.Gumps public static bool HasSpell(Mobile from, int spellID) => Spellbook.Find(from, spellID)?.HasSpell(spellID) == true; - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; diff --git a/Projects/UOContent/Gumps/SetSecureLevelGump.cs b/Projects/UOContent/Gumps/SetSecureLevelGump.cs index 1e274f93d..3bc9b8a9e 100644 --- a/Projects/UOContent/Gumps/SetSecureLevelGump.cs +++ b/Projects/UOContent/Gumps/SetSecureLevelGump.cs @@ -60,7 +60,7 @@ namespace Server.Gumps public int GetFirstID(SecureLevel level) => m_Info.Level == level ? 4006 : 4005; - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var level = info.ButtonID switch { diff --git a/Projects/UOContent/Gumps/SkillsGump.cs b/Projects/UOContent/Gumps/SkillsGump.cs index 9a9610da3..c152a1e82 100644 --- a/Projects/UOContent/Gumps/SkillsGump.cs +++ b/Projects/UOContent/Gumps/SkillsGump.cs @@ -73,7 +73,7 @@ namespace Server.Gumps AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { @@ -81,11 +81,11 @@ namespace Server.Gumps { if (m_From.AccessLevel >= AccessLevel.GameMaster) { - var text = info.GetTextEntry(0); + var text = info.GetTextEntry(0)?.Trim(); - if (text != null) + if (text?.Length > 0) { - m_Skill.Base = Convert.ToDouble(text.Text); + m_Skill.Base = Convert.ToDouble(text); CommandLogging.LogChangeProperty(m_From, m_Target, $"{m_Skill}.Base", m_Skill.Base.ToString()); } } @@ -340,7 +340,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var buttonID = info.ButtonID - 1; diff --git a/Projects/UOContent/Gumps/TithingGump.cs b/Projects/UOContent/Gumps/TithingGump.cs index c6d238cb6..66589d01a 100644 --- a/Projects/UOContent/Gumps/TithingGump.cs +++ b/Projects/UOContent/Gumps/TithingGump.cs @@ -56,7 +56,7 @@ namespace Server.Gumps AddButton(217, 272, 4023, 4024, 5); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { switch (info.ButtonID) { diff --git a/Projects/UOContent/Gumps/ToTAdminGump.cs b/Projects/UOContent/Gumps/ToTAdminGump.cs index 3e8cd5972..62cbad0ae 100644 --- a/Projects/UOContent/Gumps/ToTAdminGump.cs +++ b/Projects/UOContent/Gumps/ToTAdminGump.cs @@ -87,7 +87,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var button = info.ButtonID; var from = sender.Mobile; diff --git a/Projects/UOContent/Gumps/VendorInventoryGump.cs b/Projects/UOContent/Gumps/VendorInventoryGump.cs index 6daf9e0fc..586280175 100644 --- a/Projects/UOContent/Gumps/VendorInventoryGump.cs +++ b/Projects/UOContent/Gumps/VendorInventoryGump.cs @@ -45,7 +45,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0) { diff --git a/Projects/UOContent/Gumps/VendorRentalGumps.cs b/Projects/UOContent/Gumps/VendorRentalGumps.cs index 255bb1ce9..9abac4117 100644 --- a/Projects/UOContent/Gumps/VendorRentalGumps.cs +++ b/Projects/UOContent/Gumps/VendorRentalGumps.cs @@ -141,7 +141,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; @@ -642,7 +642,7 @@ namespace Server.Gumps AddHtmlLocalized(45, 288, 350, 20, 1062512, 0x7FFF); // No, I want to keep my vendor } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Gumps/ViewHousesGump.cs b/Projects/UOContent/Gumps/ViewHousesGump.cs index 4086386c0..b741afd5d 100644 --- a/Projects/UOContent/Gumps/ViewHousesGump.cs +++ b/Projects/UOContent/Gumps/ViewHousesGump.cs @@ -202,7 +202,7 @@ namespace Server.Gumps return list; } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Selection == null) { diff --git a/Projects/UOContent/Gumps/WarningGump.cs b/Projects/UOContent/Gumps/WarningGump.cs index c1b491ba5..d78f489b7 100644 --- a/Projects/UOContent/Gumps/WarningGump.cs +++ b/Projects/UOContent/Gumps/WarningGump.cs @@ -61,6 +61,6 @@ namespace Server.Gumps } } - public override void OnResponse(NetState sender, RelayInfo info) => m_Callback?.Invoke(info.ButtonID == 1); + public override void OnResponse(NetState sender, in RelayInfo info) => m_Callback?.Invoke(info.ButtonID == 1); } } diff --git a/Projects/UOContent/Gumps/WhoGump.cs b/Projects/UOContent/Gumps/WhoGump.cs index dd581e6e2..3852414eb 100644 --- a/Projects/UOContent/Gumps/WhoGump.cs +++ b/Projects/UOContent/Gumps/WhoGump.cs @@ -210,7 +210,7 @@ namespace Server.Gumps } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; diff --git a/Projects/UOContent/Gumps/YoungGumps.cs b/Projects/UOContent/Gumps/YoungGumps.cs index d730ff87a..0cd9db748 100644 --- a/Projects/UOContent/Gumps/YoungGumps.cs +++ b/Projects/UOContent/Gumps/YoungGumps.cs @@ -81,7 +81,7 @@ namespace Server.Gumps AddHtmlLocalized(211, 300, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs index 2ce94fa80..eddea7359 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs @@ -126,7 +126,7 @@ namespace Server.Items AddButton(145, 35, 0x868, 0x869, (int)Buttons.South); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { int m_ItemID; diff --git a/Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs b/Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs index de1ed105c..54f284717 100644 --- a/Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs +++ b/Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs @@ -141,7 +141,7 @@ namespace Server.Items AddButton(335, 285, 247, 248, 1); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; @@ -182,12 +182,7 @@ namespace Server.Items from.SendMessage("You add the personalized greeting to your St. Valentine Bear."); } - private static string GetLine(RelayInfo info, int idx) - { - var tr = info.GetTextEntry(idx); - - return tr?.Text; - } + private static string GetLine(RelayInfo info, int idx) => info.GetTextEntry(idx); } } diff --git a/Projects/UOContent/Items/Addons/BallotBox.cs b/Projects/UOContent/Items/Addons/BallotBox.cs index 13c2b744f..c581a0b23 100644 --- a/Projects/UOContent/Items/Addons/BallotBox.cs +++ b/Projects/UOContent/Items/Addons/BallotBox.cs @@ -163,7 +163,7 @@ namespace Server.Items } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Box.Deleted || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Aquarium/AquariumGump.cs b/Projects/UOContent/Items/Aquarium/AquariumGump.cs index 84ad52488..fe2a86d3a 100644 --- a/Projects/UOContent/Items/Aquarium/AquariumGump.cs +++ b/Projects/UOContent/Items/Aquarium/AquariumGump.cs @@ -82,7 +82,7 @@ namespace Server.Items } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Aquarium?.Deleted != false) { diff --git a/Projects/UOContent/Items/Containers/TreasureMapChest.cs b/Projects/UOContent/Items/Containers/TreasureMapChest.cs index bcf71721a..297ecf419 100644 --- a/Projects/UOContent/Items/Containers/TreasureMapChest.cs +++ b/Projects/UOContent/Items/Containers/TreasureMapChest.cs @@ -477,7 +477,7 @@ public partial class TreasureMapChest : LockableContainer AddHtmlLocalized(75, 197, 180, 35, 1006045, 0xFFFFFF); // Cancel } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Items/Deeds/HairRestylingDeed.cs b/Projects/UOContent/Items/Deeds/HairRestylingDeed.cs index 64dc56845..645ecb8fe 100644 --- a/Projects/UOContent/Items/Deeds/HairRestylingDeed.cs +++ b/Projects/UOContent/Items/Deeds/HairRestylingDeed.cs @@ -119,7 +119,7 @@ public partial class HairRestylingDeed : Item } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_From?.Alive != true) { diff --git a/Projects/UOContent/Items/Deeds/HolidayTreeDeed.cs b/Projects/UOContent/Items/Deeds/HolidayTreeDeed.cs index 47230c1b1..275cf0c0f 100644 --- a/Projects/UOContent/Items/Deeds/HolidayTreeDeed.cs +++ b/Projects/UOContent/Items/Deeds/HolidayTreeDeed.cs @@ -130,7 +130,7 @@ public class HolidayTreeChoiceGump : Gump AddHtmlLocalized(55, 65, 145, 25, 1018321); // Modern } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Deed.Deleted) { diff --git a/Projects/UOContent/Items/Deeds/NameChangeDeed.cs b/Projects/UOContent/Items/Deeds/NameChangeDeed.cs index 70f9b7bcd..b9c6926d9 100644 --- a/Projects/UOContent/Items/Deeds/NameChangeDeed.cs +++ b/Projects/UOContent/Items/Deeds/NameChangeDeed.cs @@ -73,7 +73,7 @@ public class NameChangeDeedGump : Gump AddHtml(x + 35, y, 240, 20, Color(text, 0xFFFFFF)); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Sender?.Deleted != false || info.ButtonID != 1 || m_Sender.RootParent != sender.Mobile) { @@ -81,9 +81,8 @@ public class NameChangeDeedGump : Gump } var m = sender.Mobile; - var nameEntry = info.GetTextEntry(0); - var newName = nameEntry?.Text.Trim(); + var newName = info.GetTextEntry(0)?.Trim(); if (!NameVerification.Validate(newName, 2, 16, true, false, true, 1, NameVerification.SpaceDashPeriodQuote)) { diff --git a/Projects/UOContent/Items/Deeds/NewPlayerTicket.cs b/Projects/UOContent/Items/Deeds/NewPlayerTicket.cs index 3cd83c624..ed988dd30 100644 --- a/Projects/UOContent/Items/Deeds/NewPlayerTicket.cs +++ b/Projects/UOContent/Items/Deeds/NewPlayerTicket.cs @@ -122,7 +122,7 @@ public partial class NewPlayerTicket : Item AddHtmlLocalized(154, 342, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Ticket.Deleted) { diff --git a/Projects/UOContent/Items/Misc/HairDye.cs b/Projects/UOContent/Items/Misc/HairDye.cs index bc5e12351..6eb0c0495 100644 --- a/Projects/UOContent/Items/Misc/HairDye.cs +++ b/Projects/UOContent/Items/Misc/HairDye.cs @@ -81,7 +81,7 @@ public class HairDyeGump : Gump } } - public override void OnResponse(NetState from, RelayInfo info) + public override void OnResponse(NetState from, in RelayInfo info) { if (_hairDye.Deleted) { diff --git a/Projects/UOContent/Items/Misc/InteriorDecorator.cs b/Projects/UOContent/Items/Misc/InteriorDecorator.cs index 5b5305655..9c197685e 100644 --- a/Projects/UOContent/Items/Misc/InteriorDecorator.cs +++ b/Projects/UOContent/Items/Misc/InteriorDecorator.cs @@ -98,7 +98,7 @@ public partial class InteriorDecorator : Item AddHtmlLocalized(90, 150, 70, 40, 1018325); // Down } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var command = info.ButtonID switch { diff --git a/Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs b/Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs index b3cc04172..ec1c07fa0 100644 --- a/Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs +++ b/Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs @@ -346,7 +346,7 @@ public class PlayerBBGump : Gump } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var page = _page; var from = _from; diff --git a/Projects/UOContent/Items/Misc/PowerGenerator.cs b/Projects/UOContent/Items/Misc/PowerGenerator.cs index 3ccb9f4e9..c2a752956 100644 --- a/Projects/UOContent/Items/Misc/PowerGenerator.cs +++ b/Projects/UOContent/Items/Misc/PowerGenerator.cs @@ -388,7 +388,7 @@ public partial class ControlPanel : AddonComponent AddImage(x, y, id); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Panel.Deleted || info.ButtonID == 0 || !m_From.CheckAlive()) { diff --git a/Projects/UOContent/Items/Misc/PromotionalToken.cs b/Projects/UOContent/Items/Misc/PromotionalToken.cs index b8723ce29..3714b8a62 100644 --- a/Projects/UOContent/Items/Misc/PromotionalToken.cs +++ b/Projects/UOContent/Items/Misc/PromotionalToken.cs @@ -86,7 +86,7 @@ public abstract partial class PromotionalToken : Item AddButton(90, 95, 0xF2, 0xF1, 0); // Cancel } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 1) { diff --git a/Projects/UOContent/Items/Misc/PublicMoongate.cs b/Projects/UOContent/Items/Misc/PublicMoongate.cs index 9409ed101..522bf892b 100644 --- a/Projects/UOContent/Items/Misc/PublicMoongate.cs +++ b/Projects/UOContent/Items/Misc/PublicMoongate.cs @@ -432,7 +432,7 @@ public class MoongateGump : Gump } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 0) // Cancel { diff --git a/Projects/UOContent/Items/Misc/SpecialBeardDye.cs b/Projects/UOContent/Items/Misc/SpecialBeardDye.cs index e19aa1abe..3626e0009 100644 --- a/Projects/UOContent/Items/Misc/SpecialBeardDye.cs +++ b/Projects/UOContent/Items/Misc/SpecialBeardDye.cs @@ -78,7 +78,7 @@ public class SpecialBeardDyeGump : Gump } } - public override void OnResponse(NetState from, RelayInfo info) + public override void OnResponse(NetState from, in RelayInfo info) { if (_specialBeardDye.Deleted) { diff --git a/Projects/UOContent/Items/Misc/SpecialHairDye.cs b/Projects/UOContent/Items/Misc/SpecialHairDye.cs index b7149e7a2..504a21fa1 100644 --- a/Projects/UOContent/Items/Misc/SpecialHairDye.cs +++ b/Projects/UOContent/Items/Misc/SpecialHairDye.cs @@ -78,7 +78,7 @@ public class SpecialHairDyeGump : Gump } } - public override void OnResponse(NetState from, RelayInfo info) + public override void OnResponse(NetState from, in RelayInfo info) { if (_specialHairDye.Deleted) { diff --git a/Projects/UOContent/Items/Misc/WindChimes.cs b/Projects/UOContent/Items/Misc/WindChimes.cs index d0d774be4..2c9bbcc36 100644 --- a/Projects/UOContent/Items/Misc/WindChimes.cs +++ b/Projects/UOContent/Items/Misc/WindChimes.cs @@ -76,7 +76,7 @@ public abstract partial class BaseWindChimes : Item AddHtmlLocalized(190, 55, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs b/Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs index cc14487ba..dd6375720 100644 --- a/Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs +++ b/Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs @@ -88,7 +88,7 @@ public partial class Bedroll : Item AddHtmlLocalized(235, 300, 110, 35, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var pm = _entry.Player; diff --git a/Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs b/Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs index fc2c816ec..a0dcd7760 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs @@ -387,7 +387,7 @@ public class MoongateConfirmGump : Gump } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs index 7f233ba52..285e980a3 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs @@ -192,7 +192,7 @@ namespace Server.Items } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { switch (info.ButtonID) { diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicHuePicker.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicHuePicker.cs index 6695064d5..770747930 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicHuePicker.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicHuePicker.cs @@ -56,7 +56,7 @@ namespace Server.Items } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { switch (info.ButtonID) { diff --git a/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs b/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs index 982a3d618..bbd6c5c1c 100644 --- a/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs +++ b/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs @@ -172,7 +172,7 @@ public class DisguiseGump : Gump } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBoxGump.cs b/Projects/UOContent/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBoxGump.cs index ccc3dbbb7..8ff4e32ed 100644 --- a/Projects/UOContent/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBoxGump.cs +++ b/Projects/UOContent/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBoxGump.cs @@ -66,7 +66,7 @@ public class DawnsMusicBoxGump : Gump AddHtmlLocalized(44, y - 2, 213, 20, 1075207, 0x7FFF); // Stop Song } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Box?.Deleted != false) { diff --git a/Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenBed.cs b/Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenBed.cs index 484ce6875..caa193d53 100644 --- a/Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenBed.cs +++ b/Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenBed.cs @@ -86,7 +86,7 @@ public partial class BrokenBedDeed : BaseAddonDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenVanity.cs b/Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenVanity.cs index d7eb4b095..6b1569612 100644 --- a/Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenVanity.cs +++ b/Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenVanity.cs @@ -81,7 +81,7 @@ public partial class BrokenVanityDeed : BaseAddonDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Gifts/HearthOfHomeFire.cs b/Projects/UOContent/Items/Special/Gifts/HearthOfHomeFire.cs index b571714db..df017f360 100644 --- a/Projects/UOContent/Items/Special/Gifts/HearthOfHomeFire.cs +++ b/Projects/UOContent/Items/Special/Gifts/HearthOfHomeFire.cs @@ -80,7 +80,7 @@ public partial class HearthOfHomeFireDeed : BaseAddonDeed AddButton(185, 35, 0x868, 0x869, 2); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed.Deleted || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Heritage Items/Curtains.cs b/Projects/UOContent/Items/Special/Heritage Items/Curtains.cs index 034d30656..bc464d42c 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/Curtains.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/Curtains.cs @@ -133,7 +133,7 @@ public partial class CurtainsDeed : BaseAddonDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Heritage Items/HangingAxes.cs b/Projects/UOContent/Items/Special/Heritage Items/HangingAxes.cs index 138e49dd9..e09de11ac 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/HangingAxes.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/HangingAxes.cs @@ -81,7 +81,7 @@ public partial class HangingAxesDeed : BaseAddonDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Heritage Items/HangingSwords.cs b/Projects/UOContent/Items/Special/Heritage Items/HangingSwords.cs index 2b6556604..1e3591f92 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/HangingSwords.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/HangingSwords.cs @@ -81,7 +81,7 @@ public partial class HangingSwordsDeed : BaseAddonDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Heritage Items/HouseLadder.cs b/Projects/UOContent/Items/Special/Heritage Items/HouseLadder.cs index 17d1c4d69..e12d2b01c 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/HouseLadder.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/HouseLadder.cs @@ -135,7 +135,7 @@ public partial class HouseLadderDeed : BaseAddonDeed AddHtmlLocalized(44, 215, 213, 20, 1075390, 0x7FFF); // West } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID is 0 or < 1 or > 8) { diff --git a/Projects/UOContent/Items/Special/Heritage Items/Statue.cs b/Projects/UOContent/Items/Special/Heritage Items/Statue.cs index 7c4a29aa5..b9100904f 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/Statue.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/Statue.cs @@ -83,7 +83,7 @@ public partial class StoneStatueDeed : BaseAddonDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Heritage Items/UnmadeBed.cs b/Projects/UOContent/Items/Special/Heritage Items/UnmadeBed.cs index c6123675a..1fc22bae7 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/UnmadeBed.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/UnmadeBed.cs @@ -85,7 +85,7 @@ public partial class UnmadeBedDeed : BaseAddonDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Heritage Items/Vanity.cs b/Projects/UOContent/Items/Special/Heritage Items/Vanity.cs index d3ab52765..bb7151360 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/Vanity.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/Vanity.cs @@ -82,7 +82,7 @@ public partial class VanityDeed : BaseAddonContainerDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Heritage Items/WoodenCoffin.cs b/Projects/UOContent/Items/Special/Heritage Items/WoodenCoffin.cs index 6aa95ffcb..1f3c5560a 100644 --- a/Projects/UOContent/Items/Special/Heritage Items/WoodenCoffin.cs +++ b/Projects/UOContent/Items/Special/Heritage Items/WoodenCoffin.cs @@ -93,7 +93,7 @@ public partial class WoodenCoffinDeed : BaseAddonDeed AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Holiday/HolidayPottedPlant.cs b/Projects/UOContent/Items/Special/Holiday/HolidayPottedPlant.cs index 5e2d44d86..7179aab90 100644 --- a/Projects/UOContent/Items/Special/Holiday/HolidayPottedPlant.cs +++ b/Projects/UOContent/Items/Special/Holiday/HolidayPottedPlant.cs @@ -77,7 +77,7 @@ public partial class PottedPlantDeed : Item AddButton(295, 50, 0x845, 0x846, 5); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false) { diff --git a/Projects/UOContent/Items/Special/Holiday/SnowStatue.cs b/Projects/UOContent/Items/Special/Holiday/SnowStatue.cs index b9f1c1ee1..60862298c 100644 --- a/Projects/UOContent/Items/Special/Holiday/SnowStatue.cs +++ b/Projects/UOContent/Items/Special/Holiday/SnowStatue.cs @@ -106,7 +106,7 @@ public partial class SnowStatueDeed : Item AddButton(275, 50, 0x845, 0x846, 4); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false) { diff --git a/Projects/UOContent/Items/Special/Holiday/Wreath.cs b/Projects/UOContent/Items/Special/Holiday/Wreath.cs index c3884454b..dbf198e21 100644 --- a/Projects/UOContent/Items/Special/Holiday/Wreath.cs +++ b/Projects/UOContent/Items/Special/Holiday/Wreath.cs @@ -127,7 +127,7 @@ public partial class WreathAddon : Item, IDyable, IAddon AddButton(20, 125, 0xFA5, 0xFA7, 0); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_addon.Deleted) { @@ -286,7 +286,7 @@ public partial class WreathDeed : Item AddButton(145, 35, 0x868, 0x869, 2); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed.Deleted) { diff --git a/Projects/UOContent/Items/Special/House Raffle/HouseRaffleManagementGump.cs b/Projects/UOContent/Items/Special/House Raffle/HouseRaffleManagementGump.cs index c5750551d..397e7bc44 100644 --- a/Projects/UOContent/Items/Special/House Raffle/HouseRaffleManagementGump.cs +++ b/Projects/UOContent/Items/Special/House Raffle/HouseRaffleManagementGump.cs @@ -164,7 +164,7 @@ public class HouseRaffleManagementGump : Gump [MethodImpl(MethodImplOptions.AggressiveInlining)] public string Color(string text, int color) => $"{text}"; - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; var buttonId = info.ButtonID; diff --git a/Projects/UOContent/Items/Special/MonsterStatuette.cs b/Projects/UOContent/Items/Special/MonsterStatuette.cs index 59065d060..36f3ceded 100644 --- a/Projects/UOContent/Items/Special/MonsterStatuette.cs +++ b/Projects/UOContent/Items/Special/MonsterStatuette.cs @@ -256,7 +256,7 @@ public partial class MonsterStatuette : Item, IRewardItem AddHtmlLocalized(190, 55, 100, 35, 1011012); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var from = sender.Mobile; diff --git a/Projects/UOContent/Items/Special/SoulStone.cs b/Projects/UOContent/Items/Special/SoulStone.cs index 32a70093c..78cee0ec1 100644 --- a/Projects/UOContent/Items/Special/SoulStone.cs +++ b/Projects/UOContent/Items/Special/SoulStone.cs @@ -315,7 +315,7 @@ public partial class SoulStone : Item, ISecurable } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0 || !_stone.IsEmpty) { @@ -406,7 +406,7 @@ public partial class SoulStone : Item, ISecurable AddHtmlLocalized(45, 412, 450, 20, 1060051, 0x7FFF); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0 || !_stone.IsEmpty) { @@ -552,7 +552,7 @@ public partial class SoulStone : Item, ISecurable AddHtmlLocalized(45, 412, 450, 20, 1060051, 0x7FFF); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0 || _stone.IsEmpty) { @@ -767,7 +767,7 @@ public partial class SoulStone : Item, ISecurable AddHtmlLocalized(45, 412, 450, 20, 1060051, 0x7FFF); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0 || _stone.IsEmpty) { @@ -813,7 +813,7 @@ public partial class SoulStone : Item, ISecurable AddHtmlLocalized(45, 412, 450, 20, 1060051, 0x7FFF); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0) { diff --git a/Projects/UOContent/Items/Special/Special Scrolls/SpecialScroll.cs b/Projects/UOContent/Items/Special/Special Scrolls/SpecialScroll.cs index 95b24985d..25f8285ea 100644 --- a/Projects/UOContent/Items/Special/Special Scrolls/SpecialScroll.cs +++ b/Projects/UOContent/Items/Special/Special Scrolls/SpecialScroll.cs @@ -120,7 +120,7 @@ public abstract partial class SpecialScroll : Item } } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs b/Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs index d8139483e..a1ca2465e 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs @@ -129,7 +129,7 @@ public partial class AnkhOfSacrificeComponent : AddonComponent { } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var from = state.Mobile; diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs b/Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs index 567c0bfc3..b2ea44b17 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs @@ -193,7 +193,7 @@ public partial class BannerDeed : Item, IRewardItem } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_banner?.Deleted != false) { @@ -324,7 +324,7 @@ public partial class BannerDeed : Item, IRewardItem AddButton(145, 35, 0x868, 0x869, (int)Buttons.South); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Banner?.Deleted != false || m_House == null) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/Brazier.cs b/Projects/UOContent/Items/Special/Veteran Rewards/Brazier.cs index 5b1086e76..7075cc8a4 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/Brazier.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/Brazier.cs @@ -176,7 +176,7 @@ public partial class RewardBrazierDeed : Item, IRewardItem AddButton(115, 50, 0x845, 0x846, 0x19BB); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_brazier?.Deleted != false) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs b/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs index cc7b43079..aae6d1b47 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs @@ -339,7 +339,7 @@ public partial class CannonAddon : BaseAddon AddHtmlLocalized(195, 109, 120, 20, 1076197, 0x7FFF); // Recharge } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (_cannon?.Deleted == false && info.ButtonID == (int)Buttons.Recharge) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/DecorativeShield.cs b/Projects/UOContent/Items/Special/Veteran Rewards/DecorativeShield.cs index 828d482f4..95fb35205 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/DecorativeShield.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/DecorativeShield.cs @@ -191,7 +191,7 @@ public partial class DecorativeShieldDeed : Item, IRewardItem } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_shield?.Deleted != false || info.ButtonID is < Start or > End || @@ -316,7 +316,7 @@ public partial class DecorativeShieldDeed : Item, IRewardItem AddButton(145, 35, 0x867, 0x869, (int)Buttons.South); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_shield?.Deleted != false || _house == null) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/HangingSkeleton.cs b/Projects/UOContent/Items/Special/Veteran Rewards/HangingSkeleton.cs index 6094a6442..0fb1edb2d 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/HangingSkeleton.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/HangingSkeleton.cs @@ -178,7 +178,7 @@ public partial class HangingSkeletonDeed : Item, IRewardItem AddButton(390, 50, 0x845, 0x846, 0x1B7F); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID != 0x1A03 && info.ButtonID != 0x1A05 && info.ButtonID != 0x1A09 && info.ButtonID != 0x1B1E && info.ButtonID != 0x1B7F) @@ -303,7 +303,7 @@ public partial class HangingSkeletonDeed : Item, IRewardItem AddButton(145, 35, 0x868, 0x869, (int)Buttons.South); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_skeleton?.Deleted != false || _house == null) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/PottedCactus.cs b/Projects/UOContent/Items/Special/Veteran Rewards/PottedCactus.cs index e7fbeb1d3..c1f4e48a7 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/PottedCactus.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/PottedCactus.cs @@ -107,7 +107,7 @@ public partial class PottedCactusDeed : Item, IRewardItem AddButton(355, 50, 0x845, 0x846, 0x1E13); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID is < 0x1E0F or > 0x1E14) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs b/Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs index cc43f570b..2deb30ca0 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs @@ -172,7 +172,7 @@ public partial class StoneAnkhDeed : BaseAddonDeed, IRewardItem AddButton(145, 35, 0x867, 0x869, (int)Buttons.East); // East } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_deed?.Deleted != false || info.ButtonID == (int)Buttons.Cancel) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/WallBanner.cs b/Projects/UOContent/Items/Special/Veteran Rewards/WallBanner.cs index cce06ee8f..b70871ef2 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/WallBanner.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/WallBanner.cs @@ -466,7 +466,7 @@ public partial class WallBannerDeed : BaseAddonDeed, IRewardItem AddButton(70, 205, 0x8AF, 0x8AF, 0, GumpButtonType.Page, 4); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (_wallBanner?.Deleted != false || info.ButtonID is <= 0 or >= 31) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs b/Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs index 34cfeb78b..87b7a4e3f 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs @@ -217,7 +217,7 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem AddTextEntry(75, 245, 350, 40, 0x0, (int)Buttons.Text, ""); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (_tool?.Deleted != false || _target?.Deleted != false) { @@ -237,7 +237,7 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem return; } - if (string.IsNullOrEmpty(relay.Text)) + if (string.IsNullOrEmpty(relay)) { _target.EngravedText = null; state.Mobile.SendLocalizedMessage(1072362); // You remove the engraving from the object. @@ -245,7 +245,7 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem else { _target.EngravedText = - Utility.FixHtml(relay.Text.Length > 64 ? relay.Text[..64] : relay.Text); + Utility.FixHtml(relay.Length > 64 ? relay[..64] : relay); state.Mobile.SendLocalizedMessage(1072361); // You engraved the object. _target.InvalidateProperties(); _tool.UsesRemaining -= 1; @@ -299,7 +299,7 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem AddHtmlLocalized(40, 109, 100, 20, 1060051, 0x7FFF); // CANCEL } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (_engraver?.Deleted != false || info.ButtonID != (int)Buttons.Confirm) { diff --git a/Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs b/Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs index 67645e105..829b8e49f 100644 --- a/Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs +++ b/Projects/UOContent/Misc/Gifts/Winter2004/Mistletoe.cs @@ -144,7 +144,7 @@ namespace Server.Items AddButton(20, 125, 0xFA5, 0xFA7, 0); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Addon.Deleted || info.ButtonID != 1) { @@ -326,7 +326,7 @@ namespace Server.Items AddButton(145, 35, 0x868, 0x869, 2); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Deed.Deleted) { diff --git a/Projects/UOContent/Misc/Guild.cs b/Projects/UOContent/Misc/Guild.cs index f9e30c56b..b1539870c 100644 --- a/Projects/UOContent/Misc/Guild.cs +++ b/Projects/UOContent/Misc/Guild.cs @@ -386,7 +386,7 @@ namespace Server.Guilds ) => new AllianceRosterGump(pm, g, m_Alliance, comparer, ascending, filter, startNumber); - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID != 8) // So that they can't get to the AdvancedSearch button { diff --git a/Projects/UOContent/Misc/ShardPoller.cs b/Projects/UOContent/Misc/ShardPoller.cs index f12e4a39c..04d6a8a21 100644 --- a/Projects/UOContent/Misc/ShardPoller.cs +++ b/Projects/UOContent/Misc/ShardPoller.cs @@ -514,7 +514,7 @@ namespace Server.Misc public string Color(string text, int color) => $"{text}"; - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_Polls?.Count > 0) { diff --git a/Projects/UOContent/Mobiles/PlayerMobile.cs b/Projects/UOContent/Mobiles/PlayerMobile.cs index 41e2a0a4a..d4a7c3165 100644 --- a/Projects/UOContent/Mobiles/PlayerMobile.cs +++ b/Projects/UOContent/Mobiles/PlayerMobile.cs @@ -4639,7 +4639,7 @@ namespace Server.Mobiles AddHtmlLocalized(148, 118, 450, 20, 1071022, 0x7FFF); // DISABLE IT! } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!m_Player.CheckAlive()) { @@ -4790,7 +4790,7 @@ namespace Server.Mobiles public ItemInsuranceMenuGump NewInstance() => new(m_From, m_Items, m_Insure, m_Page); - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 0 || !m_From.CheckAlive()) { @@ -4886,7 +4886,7 @@ namespace Server.Mobiles AddHtmlLocalized(148, 118, 450, 20, 1073996, 0x7FFF); // ACCEPT } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!m_From.CheckAlive()) { diff --git a/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs b/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs index 4bb526439..56685da6b 100644 --- a/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs +++ b/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs @@ -268,7 +268,7 @@ public class TownCrierGump : Gump } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs b/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs index 5779ff98c..bf8b97819 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs @@ -461,7 +461,7 @@ namespace Server.Mobiles } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var index = info.ButtonID - 1; diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs b/Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs index 980704674..a2a194c20 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs @@ -206,7 +206,7 @@ namespace Server.Mobiles } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var index = info.ButtonID - 1; @@ -378,7 +378,7 @@ namespace Server.Mobiles } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { @@ -569,7 +569,7 @@ namespace Server.Mobiles } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (m_FacialHair && (m_From.Female || m_From.Body.IsFemale)) { diff --git a/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs b/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs index c2f12b988..4260bc9db 100644 --- a/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs +++ b/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs @@ -788,7 +788,7 @@ namespace Server.Mobiles AddHtml(290, 440, 35, 40, "Back"); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var buttonID = info.ButtonID; @@ -1064,7 +1064,7 @@ namespace Server.Mobiles AddItem(580, 44, 4033); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (!m_Barkeeper.IsOwner(m_From)) { diff --git a/Projects/UOContent/Multis/Boats/ConfirmDryDockGump.cs b/Projects/UOContent/Multis/Boats/ConfirmDryDockGump.cs index 0d4d8d532..5745cb92a 100644 --- a/Projects/UOContent/Multis/Boats/ConfirmDryDockGump.cs +++ b/Projects/UOContent/Multis/Boats/ConfirmDryDockGump.cs @@ -29,7 +29,7 @@ namespace Server.Multis AddButton(20, 125, 4005, 4007, 1); } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID == 2) { diff --git a/Projects/UOContent/Multis/Houses/HouseFoundation.cs b/Projects/UOContent/Multis/Houses/HouseFoundation.cs index e95fcffd0..52b617163 100644 --- a/Projects/UOContent/Multis/Houses/HouseFoundation.cs +++ b/Projects/UOContent/Multis/Houses/HouseFoundation.cs @@ -2146,7 +2146,7 @@ namespace Server.Multis AddHtmlLocalized(195, 290, 55, 20, 1011012, 32767); // CANCEL } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (info.ButtonID == 1) { diff --git a/Projects/UOContent/Multis/Houses/HousePlacementTool.cs b/Projects/UOContent/Multis/Houses/HousePlacementTool.cs index 0a63667d6..87265d6f4 100644 --- a/Projects/UOContent/Multis/Houses/HousePlacementTool.cs +++ b/Projects/UOContent/Multis/Houses/HousePlacementTool.cs @@ -92,7 +92,7 @@ namespace Server.Items AddHtmlLocalized(45, 80, 200, 20, 1060392, LabelColor); // 3-Story Customizable Houses } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!m_From.CheckAlive() || m_From.Backpack?.FindItemByType() == null) { @@ -203,7 +203,7 @@ namespace Server.Items } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { if (!m_From.CheckAlive() || m_From.Backpack?.FindItemByType() == null) { diff --git a/Projects/UOContent/Network/Packets/IncomingPlayerPackets.cs b/Projects/UOContent/Network/Packets/IncomingPlayerPackets.cs index aebdeb1d0..31901ec8d 100644 --- a/Projects/UOContent/Network/Packets/IncomingPlayerPackets.cs +++ b/Projects/UOContent/Network/Packets/IncomingPlayerPackets.cs @@ -449,7 +449,8 @@ public static class IncomingPlayerPackets prof?.Start(); - gump.OnResponse(state, new RelayInfo(buttonID, switches, textEntries)); + var relayInfo = new RelayInfo(buttonID, switches, textEntries); + gump.OnResponse(state, relayInfo); prof?.Finish(); diff --git a/Projects/UOContent/Skills/Tracking/Tracking.cs b/Projects/UOContent/Skills/Tracking/Tracking.cs index 4da419af5..aaf5d07ee 100644 --- a/Projects/UOContent/Skills/Tracking/Tracking.cs +++ b/Projects/UOContent/Skills/Tracking/Tracking.cs @@ -124,7 +124,7 @@ namespace Server.SkillHandlers AddHtmlLocalized(320, 90, 100, 20, 1018090); // Players } - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { if (info.ButtonID >= 1 && info.ButtonID <= 4) { @@ -335,7 +335,7 @@ namespace Server.SkillHandlers _ => m.Player }; - public override void OnResponse(NetState state, RelayInfo info) + public override void OnResponse(NetState state, in RelayInfo info) { var index = info.ButtonID - 1; diff --git a/Projects/UOContent/Special Systems/Engines/TestCenter.cs b/Projects/UOContent/Special Systems/Engines/TestCenter.cs index f9fceeb8a..ff66b155b 100644 --- a/Projects/UOContent/Special Systems/Engines/TestCenter.cs +++ b/Projects/UOContent/Special Systems/Engines/TestCenter.cs @@ -688,7 +688,7 @@ namespace Server.Misc AddLabel(45, 85, 0x34, "Close"); } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { switch (info.ButtonID) { diff --git a/Projects/UOContent/Spells/Necromancy/SummonFamiliar.cs b/Projects/UOContent/Spells/Necromancy/SummonFamiliar.cs index 59dc363fb..d9f7d434e 100644 --- a/Projects/UOContent/Spells/Necromancy/SummonFamiliar.cs +++ b/Projects/UOContent/Spells/Necromancy/SummonFamiliar.cs @@ -144,7 +144,7 @@ namespace Server.Spells.Necromancy } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var index = info.ButtonID - 1; diff --git a/Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs b/Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs index 472aa1ab1..d28affa7d 100644 --- a/Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs +++ b/Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs @@ -463,7 +463,7 @@ namespace Server.Spells.Ninjitsu } } - public override void OnResponse(NetState sender, RelayInfo info) + public override void OnResponse(NetState sender, in RelayInfo info) { var entryID = info.ButtonID - 1;