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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Scripts/Items/Guilds/GuildTeleporter.cs
View file

@ -7,12 +7,7 @@ namespace Server.Items
{
private Item m_Stone;
[Constructible]
public GuildTeleporter() : this(null)
{
}
public GuildTeleporter(Item stone) : base(0x1869)
public GuildTeleporter(Item stone = null) : base(0x1869)
{
Weight = 1.0;
LootType = LootType.Blessed;
@ -69,7 +64,7 @@ namespace Server.Items
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (stone == null || stone.Deleted || stone.Guild == null || stone.Guild.Teleporter != this)
else if (stone?.Deleted != false || stone.Guild?.Teleporter != this)
{
from.SendLocalizedMessage(501197); // This teleporting object can not determine what guildstone to teleport
}
@ -98,4 +93,4 @@ namespace Server.Items
}
}
}
}
}

46
Scripts/Items/Guilds/Guildstone.cs
View file

@ -67,19 +67,22 @@ namespace Server.Items
BaseHouse house = BaseHouse.FindHouseAt(this);
if (house == null && m_BeforeChangeover || house != null && house.IsOwner(from) && house.Addons.Contains(this))
bool contains = false;
if (house == null && m_BeforeChangeover || house?.IsOwner(from) == true && (contains = house.Addons.Contains(this)))
{
Effects.PlaySound(GetWorldLocation(), Map, 0x3B3);
from.SendLocalizedMessage(500461); // You destroy the item.
Delete();
if (house != null && house.Addons.Contains(this))
if (contains)
house.Addons.Remove(this);
Item deed = Deed;
if (deed != null) from.AddToBackpack(deed);
if (deed != null)
from.AddToBackpack(deed);
}
}
@ -89,7 +92,7 @@ namespace Server.Items
{
base.Serialize(writer);
if (Guild != null && !Guild.Disbanded)
if (Guild?.Disbanded == false)
{
m_GuildName = Guild.Name;
m_GuildAbbrev = Guild.Abbreviation;
@ -154,7 +157,7 @@ namespace Server.Items
{
BaseHouse house = BaseHouse.FindHouseAt(this);
if (Guild.NewGuildSystem && m_BeforeChangeover && house != null && !house.Addons.Contains(this))
if (Guild.NewGuildSystem && m_BeforeChangeover && house?.Addons.Contains(this) == false)
{
house.Addons.Add(this);
m_BeforeChangeover = false;
@ -165,7 +168,7 @@ namespace Server.Items
{
base.GetProperties(list);
if (Guild != null && !Guild.Disbanded)
if (Guild?.Disbanded == false)
{
string name;
string abbr;
@ -189,7 +192,7 @@ namespace Server.Items
{
base.OnSingleClick(from);
if (Guild != null && !Guild.Disbanded)
if (Guild?.Disbanded == false)
{
string name;
@ -206,7 +209,7 @@ namespace Server.Items
public override void OnAfterDelete()
{
if (!Guild.NewGuildSystem && Guild != null && !Guild.Disbanded)
if (!Guild.NewGuildSystem && Guild?.Disbanded == false)
Guild.Disband();
}
@ -215,7 +218,7 @@ namespace Server.Items
if (Guild.NewGuildSystem)
return;
if (Guild == null || Guild.Disbanded)
if (Guild?.Disbanded != false)
{
Delete();
}
@ -233,7 +236,7 @@ namespace Server.Items
Faction guildFaction = guildState?.Faction;
Faction targetFaction = targetState?.Faction;
if (guildFaction != targetFaction || targetState != null && targetState.IsLeaving)
if (guildFaction != targetFaction || targetState?.IsLeaving == true)
return;
if (guildState != null && targetState != null)
@ -278,17 +281,8 @@ namespace Server.Items
private string m_GuildName;
[Constructible]
public GuildstoneDeed() : this(null, null)
{
}
[Constructible]
public GuildstoneDeed(string guildName, string abbrev) : this(null, guildName, abbrev)
{
}
public GuildstoneDeed(Guild g, string guildName, string abbrev) : base(0x14F0)
public GuildstoneDeed(Guild g = null, string guildName = null, string abbrev = null) :
base(0x14F0)
{
Guild = g;
m_GuildName = guildName;
@ -332,7 +326,7 @@ namespace Server.Items
{
base.Serialize(writer);
if (Guild != null && !Guild.Disbanded)
if (Guild?.Disbanded == false)
{
m_GuildName = Guild.Name;
m_GuildAbbrev = Guild.Abbreviation;
@ -370,7 +364,7 @@ namespace Server.Items
{
base.GetProperties(list);
if (Guild != null && !Guild.Disbanded)
if (Guild?.Disbanded == false)
{
string name;
string abbr;
@ -396,7 +390,7 @@ namespace Server.Items
{
BaseHouse house = BaseHouse.FindHouseAt(from);
if (house != null && house.IsOwner(from))
if (house?.IsOwner(from) == true)
{
from.SendLocalizedMessage(1062838); // Where would you like to place this decoration?
from.BeginTarget(-1, true, TargetFlags.None, Placement_OnTarget);
@ -423,7 +417,7 @@ namespace Server.Items
if (IsChildOf(from.Backpack))
{
if (house != null && house.IsOwner(from))
if (house?.IsOwner(from) == true)
{
Item addon = new Guildstone(Guild, m_GuildName, m_GuildAbbrev);
@ -443,4 +437,4 @@ namespace Server.Items
}
}
}
}
}