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

fix: Optimizes gump relay info (Prep for Static Gumps) (#1698)

Browse source
This commit is contained in:
Kamron Batman 2024-03-07 20:54:53 -08:00 • committed by GitHub
parent 50fcee12dc
commit cfe9e04c78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
220 changed files with 364 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Gumps/Gump.cs
View file

@ -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)
{
}

39
Projects/Server/Gumps/RelayInfo.cs
View file

@ -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 <http://www.gnu.org/licenses/>. *
*************************************************************************/
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<int> Switches { get; }
public TextRelay[] TextEntries { get; }
public ReadOnlySpan<TextRelay> 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;
}
}

6
Projects/Server/Items/VirtualCheck.cs
View file

@ -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))
{

26
Projects/UOContent/Commands/Batch.cs
View file

@ -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))
{

6
Projects/UOContent/Commands/Generic/Commands/Interface.cs
View file

@ -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)
{

2
Projects/UOContent/Commands/HelpInfo.cs
View file

@ -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)

5
Projects/UOContent/Commands/Object Creation/AddGump.cs
View file

@ -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)
{

2
Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs
View file

@ -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;

16
Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Advanced Search/AdvancedSearchWarningGump.cs
View file

@ -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);
}

2
Projects/UOContent/Engines/Bulk Orders/Books/BOBFilterGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Bulk Orders/Books/BOBGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Bulk Orders/Books/BODBuyGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs
View file

@ -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
{

2
Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs
View file

@ -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
{

2
Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/ConPVP/AcceptDuelGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ConPVP/Gumps/AcceptTeamGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/ConPVP/Gumps/ArenaGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/ConPVP/Gumps/DuelContextGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/ConPVP/Gumps/ParticipantGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ConPVP/Gumps/PickRulesetGump.cs
View file

@ -82,7 +82,7 @@ namespace Server.Engines.ConPVP
public string Center(string text) => $"<CENTER>{text}</CENTER>";
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (m_Context?.Registered == false)
{

2
Projects/UOContent/Engines/ConPVP/Gumps/ReadyGump.cs
View file

@ -102,7 +102,7 @@ namespace Server.Engines.ConPVP
public string Center(string text) => $"<CENTER>{text}</CENTER>";
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
}
}

2
Projects/UOContent/Engines/ConPVP/Gumps/ReadyUpGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ConPVP/Gumps/RulesetGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ConPVP/Gumps/TournamentBracketGump.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/ConPVP/Preferences.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Craft/Core/CraftGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Craft/Core/CraftGumpItem.cs
View file

@ -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)

2
Projects/UOContent/Engines/Craft/Core/QueryMakersMarkGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Factions/Gumps/ElectionGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Factions/Gumps/ElectionManagementGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Factions/Gumps/FactionImbueGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Factions/Gumps/FactionStoneGump.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/Factions/Gumps/FinanceGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Factions/Gumps/HorseBreederGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Factions/Gumps/JoinStoneGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Factions/Gumps/LeaveFactionGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Factions/Gumps/SheriffGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Factions/Gumps/TownStoneGump.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/Factions/Gumps/VoteGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Help/HelpGump.cs
View file

@ -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;

5
Projects/UOContent/Engines/Help/PagePromptGump.cs
View file

@ -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)
{

24
Projects/UOContent/Engines/Help/PageQueueGump.cs
View file

@ -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 );

2
Projects/UOContent/Engines/Help/PageResponseGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Help/SpeechLogGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Help/StuckMenu.cs
View file

@ -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();

2
Projects/UOContent/Engines/Khaldun/PuzzleChest.cs
View file

@ -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())
{

2
Projects/UOContent/Engines/ML Quests/Gumps/QuestCancelConfirmGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ML Quests/Gumps/QuestLogDetailedGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ML Quests/Gumps/QuestLogGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ML Quests/Gumps/QuestOfferGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ML Quests/Gumps/QuestReportBackGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ML Quests/Gumps/QuestRewardGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/ML Quests/Gumps/RaceChangeGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Plants/EmptyTheBowlGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Plants/MainPlantGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Plants/ReproductionGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Plants/SetToDecorativeGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Quests/Collector/Mobiles/Impresario.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/Quests/Core/QuestConversation.cs
View file

@ -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)
{

4
Projects/UOContent/Engines/Quests/Core/QuestObjective.cs
View file

@ -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)
{

4
Projects/UOContent/Engines/Quests/Core/QuestSystem.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Quests/The Summoning/Mobiles/Chyloth.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs
View file

@ -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;

18
Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs
View file

@ -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;
}

16
Projects/UOContent/Engines/Spawners/SpawnerGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/Gumps/CharacterStatueGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Veteran Rewards/RewardChoiceGump.cs
View file

@ -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;

2
Projects/UOContent/Engines/Veteran Rewards/RewardConfirmGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Veteran Rewards/RewardDemolitionGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Veteran Rewards/RewardNoticeGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Veteran Rewards/RewardOptionGump.cs
View file

@ -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))
{

2
Projects/UOContent/Engines/Virtues/Justice.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Virtues/VirtueGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Virtues/VirtueInfoGump.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/Virtues/VirtueStatusGump.cs
View file

@ -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)
{

2
Projects/UOContent/Gumps/AddDoorGump.cs
View file

@ -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;

29
Projects/UOContent/Gumps/AdminGump.cs
View file

@ -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<NetState>();
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<IAccount> 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<object>();
@ -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))
{

20
Projects/UOContent/Gumps/BanDurationGump.cs
View file

@ -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)
{

2
Projects/UOContent/Gumps/BaseConfirmGump.cs
View file

@ -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)
{

2
Projects/UOContent/Gumps/BaseImageTileButtonsGump.cs
View file

@ -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;

14
Projects/UOContent/Gumps/ClientGump.cs
View file

@ -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}\""
);
}

2
Projects/UOContent/Gumps/CommentsGump.cs
View file

@ -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)
{

2
Projects/UOContent/Gumps/ConfirmHeritageGump.cs
View file

@ -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)
{

2
Projects/UOContent/Gumps/ConfirmHouseResize.cs
View file

@ -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)
{

2
Projects/UOContent/Gumps/ConfirmReleaseGump.cs
View file

@ -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 &&

2
Projects/UOContent/Gumps/Go/GoGump.cs
View file

@ -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;

2
Projects/UOContent/Gumps/Guilds/DeclareFealtyGump.cs
View file

@ -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))
{

2
Projects/UOContent/Gumps/Guilds/GrantGuildTitleGump.cs
View file

@ -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))
{

2
Projects/UOContent/Gumps/Guilds/GuildAcceptWarGump.cs
View file

@ -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))
{

2
Projects/UOContent/Gumps/Guilds/GuildAdminCandidatesGump.cs
View file

@ -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))
{

2
Projects/UOContent/Gumps/Guilds/GuildCandidatesGump.cs
View file

@ -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))
{

2
Projects/UOContent/Gumps/Guilds/GuildChangeTypeGump.cs
View file

@ -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))

2
Projects/UOContent/Gumps/Guilds/GuildCharterGump.cs
View file

@ -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))
{

2
Projects/UOContent/Gumps/Guilds/GuildDeclarePeaceGump.cs
View file

@ -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))
{

Some files were not shown because too many files have changed in this diff Show more