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

fix: Cleans up some string allocations from trim (#1759)

Browse source
This commit is contained in:
Kamron Batman 2024-05-03 22:43:11 -07:00 • committed by GitHub
parent 9d2f471e91
commit d77668d77a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Accounting/AccountHandler.cs
View file

@ -309,7 +309,7 @@ public static class AccountHandler
if (Accounts.GetAccount(un) is not Account acct)
{
// To prevent someone from making an account of just '' or a bunch of meaningless spaces
if (AutoAccountCreation && un.Trim().Length > 0)
if (AutoAccountCreation && !string.IsNullOrWhiteSpace(un))
{
e.State.Account = acct = CreateAccount(e.State, un, pw);
e.Accepted = acct?.CheckAccess(e.State) ?? false;

3
Projects/UOContent/Engines/Bulk Orders/Books/BulkOrderBook.cs
View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.ContextMenus;
@ -287,7 +288,7 @@ public partial class BulkOrderBook : Item, ISecurable
if (from.CheckAlive() && m_Book.IsChildOf(from.Backpack))
{
m_Book.BookName = text.Trim().FixHtml();
m_Book.BookName = text.AsSpan().Trim().FixHtml();
from.SendLocalizedMessage(1062480); // The bulk order book's name has been changed.
}

8
Projects/UOContent/Gumps/Guilds/GuildListGump.cs
View file

@ -50,13 +50,7 @@ namespace Server.Gumps
var g = m_List[i];
string name;
if ((name = g.Name) != null && (name = name.Trim()).Length <= 0)
{
name = "(empty)";
}
string name = g.Name?.Trim().DefaultIfNullOrEmpty("(empty)");
AddLabel(radio ? 55 : 20, 35 + i % 11 * 30, 0, name);
}
}

8
Projects/UOContent/Gumps/Guilds/GuildMobileListGump.cs
View file

@ -51,13 +51,7 @@ namespace Server.Gumps
var m = m_List[i];
string name;
if ((name = m.Name) != null && (name = name.Trim()).Length <= 0)
{
name = "(empty)";
}
string name = m.Name?.Trim().DefaultIfNullOrEmpty("(empty)");
AddLabel(radio ? 55 : 20, 35 + i % 11 * 30, 0, name);
}
}

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

@ -1,3 +1,4 @@
using System;
using Server.Factions;
using Server.Gumps;
using Server.Mobiles;
@ -173,7 +174,7 @@ namespace Server.Guilds
return;
}
var charter = text.Trim().FixHtml();
var charter = text.AsSpan().Trim().FixHtml();
if (charter.Length > 50)
{
@ -193,7 +194,7 @@ namespace Server.Guilds
return;
}
var site = text.Trim().FixHtml();
var site = text.AsSpan().Trim().FixHtml();
if (site.Length > 50)
{

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

@ -1,3 +1,4 @@
using System;
using Server.Gumps;
using Server.Mobiles;
using Server.Network;
@ -265,7 +266,7 @@ namespace Server.Guilds
return;
}
var title = text.Trim().FixHtml();
var title = text.AsSpan().Trim().FixHtml();
if (title.Length > 20)
{

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

@ -677,7 +677,7 @@ namespace Server.Guilds
}
else
{
var name = text.Trim().FixHtml();
var name = text.AsSpan().Trim().FixHtml();
if (!CheckProfanity(name))
{

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

@ -1,3 +1,4 @@
using System;
using Server.Items;
using Server.Multis;
using Server.Network;
@ -480,7 +481,7 @@ namespace Server.Gumps
if (m_Book.CheckAccess(from))
{
m_Book.Description = text.Trim().FixHtml();
m_Book.Description = text.AsSpan().Trim().FixHtml();
from.CloseGump<RunebookGump>();
from.SendGump(new RunebookGump(from, m_Book));

3
Projects/UOContent/Multis/Boats/BaseBoat.cs
View file

@ -784,7 +784,8 @@ namespace Server.Multis
if (e.Speech.Length > 8)
{
Rename(e.Speech[8..].Trim().DefaultIfNullOrEmpty(null));
var newName = e.Speech.AsSpan(8).Trim();
Rename(newName.Length == 0 ? null : newName.ToString());
}
}