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

Fixes bad expressions, bad bool checks in loops, a few null pointer exceptions, and optimizes constructors.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 23:16:45 -07:00
parent 8da55d6043
commit f93c3b992e
62 changed files with 318 additions and 634 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Items/Special/Holiday/IcyPatch.cs
View file

@ -52,7 +52,7 @@ namespace Server.Items
if (freeze)
{
m.Frozen = freeze;
m.Frozen = true;
Timer.DelayCall(TimeSpan.FromSeconds(message == 1095162 ? 2.0 : 1.25),
new TimerStateCallback(EndFall_Callback), m);
}

7
Scripts/Items/Special/Veteran Rewards/Banner.cs
View file

@ -301,12 +301,7 @@ namespace Server.Items
}
else if (north || west)
{
Banner banner = null;
if (north)
banner = new Banner(m_ItemID);
else if (west)
banner = new Banner(m_ItemID + 1);
Banner banner = new Banner(m_ItemID + (west ? 0 : 1));
house.Addons.Add(banner);

13
Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs
View file

@ -210,11 +210,7 @@ namespace Server.Items
private DecorativeShieldDeed m_Shield;
public InternalGump(DecorativeShieldDeed shield) : this(shield, 1)
{
}
public InternalGump(DecorativeShieldDeed shield, int page) : base(150, 50)
public InternalGump(DecorativeShieldDeed shield, int page = 1) : base(150, 50)
{
m_Shield = shield;
m_Page = page;
@ -321,12 +317,7 @@ namespace Server.Items
}
else if (north || west)
{
DecorativeShield shield = null;
if (north)
shield = new DecorativeShield(m_ItemID);
else if (west)
shield = new DecorativeShield(GetWestItemID(m_ItemID));
DecorativeShield shield = new DecorativeShield(west ? GetWestItemID(m_ItemID) : m_ItemID);
house.Addons.Add(shield);

7
Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs
View file

@ -309,12 +309,7 @@ namespace Server.Items
}
else if (north || west)
{
HangingSkeleton banner = null;
if (north)
banner = new HangingSkeleton(m_ItemID);
else if (west)
banner = new HangingSkeleton(GetWestItemID(m_ItemID));
HangingSkeleton banner = new HangingSkeleton(west ? GetWestItemID(m_ItemID) : m_ItemID);
house.Addons.Add(banner);