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