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

68
Scripts/Items/Facial/Beard.cs
View file

@ -17,11 +17,7 @@ namespace Server.Items
}
}*/
protected Beard(int itemID) : this(itemID, 0)
{
}
protected Beard(int itemID, int hue) : base(itemID)
protected Beard(int itemID, int hue = 0) : base(itemID)
{
LootType = LootType.Blessed;
Layer = Layer.FacialHair;
@ -67,12 +63,7 @@ namespace Server.Items
public class GenericBeard : Beard
{
private GenericBeard(int itemID) : this(itemID, 0)
{
}
private GenericBeard(int itemID, int hue) : base(itemID, hue)
private GenericBeard(int itemID, int hue = 0) : base(itemID, hue)
{
}
@ -97,12 +88,7 @@ namespace Server.Items
public class LongBeard : Beard
{
private LongBeard()
: this(0)
{
}
private LongBeard(int hue)
private LongBeard(int hue = 0)
: base(0x203E, hue)
{
}
@ -128,13 +114,7 @@ namespace Server.Items
public class ShortBeard : Beard
{
private ShortBeard()
: this(0)
{
}
private ShortBeard(int hue)
private ShortBeard(int hue = 0)
: base(0x203f, hue)
{
}
@ -160,13 +140,7 @@ namespace Server.Items
public class Goatee : Beard
{
private Goatee()
: this(0)
{
}
private Goatee(int hue)
private Goatee(int hue = 0)
: base(0x2040, hue)
{
}
@ -192,13 +166,7 @@ namespace Server.Items
public class Mustache : Beard
{
private Mustache()
: this(0)
{
}
private Mustache(int hue)
private Mustache(int hue = 0)
: base(0x2041, hue)
{
}
@ -224,13 +192,7 @@ namespace Server.Items
public class MediumShortBeard : Beard
{
private MediumShortBeard()
: this(0)
{
}
private MediumShortBeard(int hue)
private MediumShortBeard(int hue = 0)
: base(0x204B, hue)
{
}
@ -256,13 +218,7 @@ namespace Server.Items
public class MediumLongBeard : Beard
{
private MediumLongBeard()
: this(0)
{
}
private MediumLongBeard(int hue)
private MediumLongBeard(int hue = 0)
: base(0x204C, hue)
{
}
@ -288,13 +244,7 @@ namespace Server.Items
public class Vandyke : Beard
{
private Vandyke()
: this(0)
{
}
private Vandyke(int hue)
private Vandyke(int hue = 0)
: base(0x204D, hue)
{
}

95
Scripts/Items/Facial/Hair.cs
View file

@ -62,12 +62,7 @@ namespace Server.Items
}
* */
protected Hair(int itemID)
: this(itemID, 0)
{
}
protected Hair(int itemID, int hue)
protected Hair(int itemID, int hue = 0)
: base(itemID)
{
LootType = LootType.Blessed;
@ -115,13 +110,7 @@ namespace Server.Items
public class GenericHair : Hair
{
private GenericHair(int itemID)
: this(itemID, 0)
{
}
private GenericHair(int itemID, int hue)
private GenericHair(int itemID, int hue = 0)
: base(itemID, hue)
{
}
@ -148,13 +137,7 @@ namespace Server.Items
public class Mohawk : Hair
{
private Mohawk()
: this(0)
{
}
private Mohawk(int hue)
private Mohawk(int hue = 0)
: base(0x2044, hue)
{
}
@ -181,13 +164,7 @@ namespace Server.Items
public class PageboyHair : Hair
{
private PageboyHair()
: this(0)
{
}
private PageboyHair(int hue)
private PageboyHair(int hue = 0)
: base(0x2045, hue)
{
}
@ -214,13 +191,7 @@ namespace Server.Items
public class BunsHair : Hair
{
private BunsHair()
: this(0)
{
}
private BunsHair(int hue)
private BunsHair(int hue = 0)
: base(0x2046, hue)
{
}
@ -247,13 +218,7 @@ namespace Server.Items
public class LongHair : Hair
{
private LongHair()
: this(0)
{
}
private LongHair(int hue)
private LongHair(int hue = 0)
: base(0x203C, hue)
{
}
@ -280,13 +245,7 @@ namespace Server.Items
public class ShortHair : Hair
{
private ShortHair()
: this(0)
{
}
private ShortHair(int hue)
private ShortHair(int hue = 0)
: base(0x203B, hue)
{
}
@ -313,13 +272,7 @@ namespace Server.Items
public class PonyTail : Hair
{
private PonyTail()
: this(0)
{
}
private PonyTail(int hue)
private PonyTail(int hue = 0)
: base(0x203D, hue)
{
}
@ -346,13 +299,7 @@ namespace Server.Items
public class Afro : Hair
{
private Afro()
: this(0)
{
}
private Afro(int hue)
private Afro(int hue = 0)
: base(0x2047, hue)
{
}
@ -379,13 +326,7 @@ namespace Server.Items
public class ReceedingHair : Hair
{
private ReceedingHair()
: this(0)
{
}
private ReceedingHair(int hue)
private ReceedingHair(int hue = 0)
: base(0x2048, hue)
{
}
@ -412,13 +353,7 @@ namespace Server.Items
public class TwoPigTails : Hair
{
private TwoPigTails()
: this(0)
{
}
private TwoPigTails(int hue)
private TwoPigTails(int hue = 0)
: base(0x2049, hue)
{
}
@ -445,13 +380,7 @@ namespace Server.Items
public class KrisnaHair : Hair
{
private KrisnaHair()
: this(0)
{
}
private KrisnaHair(int hue)
private KrisnaHair(int hue = 0)
: base(0x204A, hue)
{
}