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