Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)
This commit is contained in:
parent
e748af4430
commit
513e54f70e
1094 changed files with 15913 additions and 21892 deletions
|
|
@ -91,7 +91,7 @@ namespace Server.Items
|
|||
|
||||
public override void OnClick()
|
||||
{
|
||||
if (m_Ankh == null || m_Ankh.Deleted)
|
||||
if (m_Ankh?.Deleted != false)
|
||||
return;
|
||||
|
||||
Resurrect(m_Mobile as PlayerMobile, m_Ankh);
|
||||
|
|
@ -131,7 +131,7 @@ namespace Server.Items
|
|||
|
||||
private class AnkhResurrectGump : ResurrectGump
|
||||
{
|
||||
public AnkhResurrectGump(Mobile owner, ResurrectMessage msg) : base(owner, owner, msg, false)
|
||||
public AnkhResurrectGump(Mobile owner, ResurrectMessage msg) : base(owner, owner, msg)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -141,7 +141,7 @@ namespace Server.Items
|
|||
|
||||
if (info.ButtonID == 1 || info.ButtonID == 2)
|
||||
{
|
||||
if (from.Map == null || !from.Map.CanFit(from.Location, 16, false, false))
|
||||
if (from.Map?.CanFit(from.Location, 16, false, false) != true)
|
||||
{
|
||||
from.SendLocalizedMessage(502391); // Thou can not be resurrected there!
|
||||
return;
|
||||
|
|
@ -241,12 +241,7 @@ namespace Server.Items
|
|||
private bool m_IsRewardItem;
|
||||
|
||||
[Constructible]
|
||||
public AnkhOfSacrificeDeed() : this(false)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public AnkhOfSacrificeDeed(bool isRewardItem)
|
||||
public AnkhOfSacrificeDeed(bool isRewardItem = false)
|
||||
{
|
||||
LootType = LootType.Blessed;
|
||||
|
||||
|
|
@ -305,7 +300,7 @@ namespace Server.Items
|
|||
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (m_IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this, null))
|
||||
if (m_IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
|
||||
return;
|
||||
|
||||
if (IsChildOf(from.Backpack))
|
||||
|
|
@ -345,4 +340,4 @@ namespace Server.Items
|
|||
m_IsRewardItem = reader.ReadBool();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue