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

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

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

2
Projects/UOContent/Gumps/Guilds/GuildDismissGump.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/GuildGump.cs
View file

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

2
Projects/UOContent/Gumps/Guilds/GuildRejectWarGump.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/GuildRescindDeclarationGump.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/GuildRosterGump.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/GuildWarAdminGump.cs
View file

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

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

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

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

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

2
Projects/UOContent/Gumps/Guilds/New Guild System/AdvancedSearch.cs
View file

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

2
Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildGump.cs
View file

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

4
Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildListGump.cs
View file

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

12
Projects/UOContent/Gumps/Guilds/New Guild System/CreateGuildGump.cs
View file

@ -42,7 +42,7 @@ namespace Server.Guilds
AddHtmlLocalized(45, 260, 200, 30, 1062943, 0x0); // <i>Ignore Guild Invites</i>
}
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)
{

2
Projects/UOContent/Gumps/Guilds/New Guild System/DiplomacyGump.cs
View file

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

2
Projects/UOContent/Gumps/Guilds/New Guild System/GuildInfoGump.cs
View file

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

2
Projects/UOContent/Gumps/Guilds/New Guild System/GuildInvitationRequest.cs
View file

@ -36,7 +36,7 @@ namespace Server.Guilds
AddHtmlLocalized(45, 130, 150, 30, 1062943, 0x0); // <i>Ignore Guild Invites</i>
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (guild.Disbanded || player.Guild != null)
{

2
Projects/UOContent/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs
View file

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

2
Projects/UOContent/Gumps/Guilds/New Guild System/GuildRosterGump.cs
View file

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

2
Projects/UOContent/Gumps/Guilds/New Guild System/OtherGuildInfo.cs
View file

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

6
Projects/UOContent/Gumps/Guilds/New Guild System/WarDeclarationGump.cs
View file

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

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

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

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

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

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

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

6
Projects/UOContent/Gumps/HouseGump.cs
View file

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

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

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

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

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

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

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

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

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

10
Projects/UOContent/Gumps/PlayerVendorGumps.cs
View file

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

4
Projects/UOContent/Gumps/PolymorphGump.cs
View file

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

2
Projects/UOContent/Gumps/Props/PropsGump.cs
View file

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

2
Projects/UOContent/Gumps/Props/SetCustomEnumGump.cs
View file

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

8
Projects/UOContent/Gumps/Props/SetGump.cs
View file

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

2
Projects/UOContent/Gumps/Props/SetListOptionGump.cs
View file

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

2
Projects/UOContent/Gumps/Props/SetObjectGump.cs
View file

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

9
Projects/UOContent/Gumps/Props/SetPoint2DGump.cs
View file

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

12
Projects/UOContent/Gumps/Props/SetPoint3DGump.cs
View file

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

10
Projects/UOContent/Gumps/Props/SetTimeSpanGump.cs
View file

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

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

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

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

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

4
Projects/UOContent/Gumps/RewardGump.cs
View file

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

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

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

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

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

10
Projects/UOContent/Gumps/SkillsGump.cs
View file

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

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

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

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

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

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

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

4
Projects/UOContent/Gumps/VendorRentalGumps.cs
View file

@ -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 <strong>keep my vendor</strong>
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
var from = sender.Mobile;

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

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

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

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

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

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

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

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