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

Updates a bug (#282)

Browse source 
Bumps release version
This commit is contained in:
Kamron Batman 2020-10-21 20:35:09 -07:00 • committed by GitHub
parent 185bee7ae2
commit 3b7f648c27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server.Tests/Utility/TestStringHelpers.cs
View file

@ -10,7 +10,7 @@ namespace Server.Tests
[InlineData("this is a valid string", "default value", "this is a valid string")]
public void TestIsNullOrDefault(string value, string defaultValue, string expected)
{
var actual = value.IsNullOrDefault(defaultValue);
var actual = value.DefaultIfNullOrEmpty(defaultValue);
Assert.Equal(expected, actual);
}

2
Projects/Server/Utilities/Utility.cs
View file

@ -124,7 +124,7 @@ namespace Server
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static string IsNullOrDefault(this string value, string def) => value?.Length > 0 ? value : def;
public static string DefaultIfNullOrEmpty(this string value, string def) => value?.Length > 0 ? value : def;
public static IPAddress Intern(IPAddress ipAddress)
{

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

@ -120,7 +120,7 @@ namespace Server.Commands
return "null";
}
ip = ip.Trim().IsNullOrDefault("empty");
ip = ip.Trim().DefaultIfNullOrEmpty("empty");
var isSafe = true;

2
Projects/UOContent/Engines/Chat/Channel.cs
View file

@ -39,7 +39,7 @@ namespace Server.Engines.Chat
public string Password
{
get => m_Password;
set => m_Password = value?.Trim().IsNullOrDefault(null);
set => m_Password = (value?.Trim()).DefaultIfNullOrEmpty(null);
}
public bool VoiceRestricted

4
Projects/UOContent/Engines/Chat/ChatActionHandlers.cs
View file

@ -204,7 +204,7 @@ namespace Server.Engines.Chat
}
}
password = password?.Trim().IsNullOrDefault(null);
password = (password?.Trim()).DefaultIfNullOrEmpty(null);
var joined = Channel.FindChannelByName(name);
@ -246,7 +246,7 @@ namespace Server.Engines.Chat
name = param;
}
password = password?.Trim().IsNullOrDefault(null);
password = (password?.Trim()).DefaultIfNullOrEmpty(null);
Channel.AddChannel(name, password).AddUser(from, password);
}

2
Projects/UOContent/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -262,7 +262,7 @@ namespace Server.Engines.ConPVP
if (m_Counter >= m_Hill.ScoreInterval)
{
var hill = m_Hill.Name.IsNullOrDefault("the hill");
var hill = m_Hill.Name.DefaultIfNullOrEmpty("the hill");
var king = m_Hill.King.Name ?? "";
m_Hill.Game.Alert("{0} ({1}) is king of {2}!", king, ti.Name, hill);

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

@ -223,7 +223,7 @@ namespace Server.Gumps
if (shouldSet)
{
var comment = c?.Text.Trim().IsNullOrDefault(null);
var comment = c?.Text.Trim().DefaultIfNullOrEmpty(null);
for (var i = 0; i < m_List.Count; ++i)
{

4
Projects/UOContent/Gumps/Guilds/GuildGump.cs
View file

@ -26,7 +26,7 @@ namespace Server.Gumps
if (leader != null)
{
var leadTitle = leader.GuildTitle?.Trim();
var leadName = leader.Name?.Trim().IsNullOrDefault("(empty)");
var leadName = (leader.Name?.Trim()).DefaultIfNullOrEmpty("(empty)");
var text = leadTitle?.Length > 0 ? $"{leadTitle}: {leadName}" : leadName;
AddHtml(220, 15, 250, 35, text);
@ -44,7 +44,7 @@ namespace Server.Gumps
fealty ??= beholder;
var fealtyName = fealty.Name?.Trim().IsNullOrDefault("(empty)");
var fealtyName = (fealty.Name?.Trim()).DefaultIfNullOrEmpty("(empty)");
if (beholder == fealty)
{

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

@ -60,7 +60,7 @@ namespace Server.Guilds
AddImageTiled(65, 196, 480, 4, 0x238D);
var s = guild.Charter.IsNullOrDefault("The guild leader has not yet set the guild charter.");
var s = guild.Charter.DefaultIfNullOrEmpty("The guild leader has not yet set the guild charter.");
AddHtml(65, 216, 480, 80, s, true, true);
if (isLeader)
@ -68,7 +68,7 @@ namespace Server.Guilds
AddButton(40, 251, 0x4B9, 0x4BA, 4); // Charter Edit button
}
s = guild.Website.IsNullOrDefault("Guild website not yet set.");
s = guild.Website.DefaultIfNullOrEmpty("Guild website not yet set.");
AddHtml(65, 306, 480, 30, s, true);
if (isLeader)

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

@ -569,7 +569,7 @@ namespace Server.Gumps
{
var m = m_House.Owner;
return m?.Deleted != false ? "(unowned)" : m.Name.Trim().IsNullOrDefault("(no name)");
return m?.Deleted != false ? "(unowned)" : m.Name.Trim().DefaultIfNullOrEmpty("(no name)");
}
private string GetDateTime(DateTime val) =>

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

@ -93,7 +93,7 @@ namespace Server.Gumps
public static List<Mobile> BuildList(Mobile owner, string rawFilter)
{
var filter = rawFilter.Trim().ToLower().IsNullOrDefault(null);
var filter = rawFilter.Trim().ToLower().DefaultIfNullOrEmpty(null);
var list = new List<Mobile>();
var states = TcpServer.Instances;

2
Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs
View file

@ -439,7 +439,7 @@ namespace Server.Items
AddHtml(255, 180, 150, 20, message.Time.ToString("yyyy-MM-dd HH:mm:ss"));
var poster = message.Poster;
var name = poster?.Name?.Trim().IsNullOrDefault("Someone");
var name = (poster?.Name?.Trim()).DefaultIfNullOrEmpty("Someone");
AddHtml(255, 200, 150, 20, name);

4
Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs
View file

@ -182,7 +182,7 @@ namespace Server.Items
{
var sign = m_House.Sign;
m_Description = sign?.Name?.Trim().IsNullOrDefault("an unnamed house");
m_Description = (sign?.Name?.Trim()).DefaultIfNullOrEmpty("an unnamed house");
setDesc = true;
@ -257,7 +257,7 @@ namespace Server.Items
{
if (m_Marked)
{
var desc = m_Description?.Trim().IsNullOrDefault("an unknown location");
var desc = (m_Description?.Trim()).DefaultIfNullOrEmpty("an unknown location");
if (m_TargetMap == Map.Tokuno)
{

2
Projects/UOContent/Items/Skill Items/Magical/Runebook.cs
View file

@ -416,7 +416,7 @@ namespace Server.Items
from.Send(new PlaySound(0x42, GetWorldLocation()));
from.SendMessage(rune.Description?.Trim().IsNullOrDefault("(indescript)"));
from.SendMessage((rune.Description?.Trim()).DefaultIfNullOrEmpty("(indescript)"));
return true;
}

4
Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -89,7 +89,7 @@ namespace Server.Items
{
list.Add(
1054131,
$"{m_Charges}\t{PetName.IsNullOrDefault(" ")}"
$"{m_Charges}\t{PetName.DefaultIfNullOrEmpty(" ")}"
); // a crystal ball of pet summoning: [charges: ~1_charges~] : [linked pet: ~2_petName~]
}
@ -98,7 +98,7 @@ namespace Server.Items
LabelTo(
from,
1054131,
$"{m_Charges}\t{PetName.IsNullOrDefault(" ")}"
$"{m_Charges}\t{PetName.DefaultIfNullOrEmpty(" ")}"
); // a crystal ball of pet summoning: [charges: ~1_charges~] : [linked pet: ~2_petName~]
}

4
Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -93,7 +93,7 @@ namespace Server.Items
{
list.Add(
1054000,
$"{m_Charges}\t{m_Inscription.IsNullOrDefault(" ")}"
$"{m_Charges}\t{m_Inscription.DefaultIfNullOrEmpty(" ")}"
); // a bracelet of binding : ~1_val~ ~2_val~
}
@ -102,7 +102,7 @@ namespace Server.Items
LabelTo(
from,
1054000,
$"{m_Charges}\t{m_Inscription.IsNullOrDefault(" ")}"
$"{m_Charges}\t{m_Inscription.DefaultIfNullOrEmpty(" ")}"
); // a bracelet of binding : ~1_val~ ~2_val~
}

2
Projects/UOContent/Mobiles/Vendors/PlayerVendor.cs
View file

@ -966,7 +966,7 @@ namespace Server.Mobiles
return;
}
var name = item.Name.IsNullOrDefault($"#{item.LabelNumber}");
var name = item.Name.DefaultIfNullOrEmpty($"#{item.LabelNumber}");
from.SendLocalizedMessage(1043303, name); // Type in a price and description for ~1_ITEM~ (ESC=not for sale)
from.Prompt = new VendorPricePrompt(this, vi);

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

@ -696,7 +696,7 @@ namespace Server.Multis
return;
}
Rename(newName.Trim().IsNullOrDefault(null));
Rename(newName.Trim().DefaultIfNullOrEmpty(null));
}
public DryDockResult CheckDryDock(Mobile from)
@ -859,7 +859,7 @@ namespace Server.Multis
if (e.Speech.Length > 8)
{
Rename(e.Speech.Substring(8).Trim().IsNullOrDefault(null));
Rename(e.Speech.Substring(8).Trim().DefaultIfNullOrEmpty(null));
}
}