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

6
Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -80,7 +80,7 @@ namespace Server.Factions
{
PlayerState victimState = PlayerState.Find(from);
if (victimState != null && victimState.CanGiveSilverTo(Placer) && victimState.KillPoints > 0)
if (victimState?.CanGiveSilverTo(Placer) == true && victimState.KillPoints > 0)
{
int silverGiven = Faction.AwardSilver(Placer, silverToAward);
@ -236,7 +236,7 @@ namespace Server.Factions
public override void OnDelete()
{
if (Faction != null && Faction.Traps.Contains(this))
if (Faction?.Traps.Contains(this) == true)
Faction.Traps.Remove(this);
base.OnDelete();
@ -261,4 +261,4 @@ namespace Server.Factions
return faction != Faction;
}
}
}
}

8
Scripts/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs
View file

@ -8,16 +8,12 @@ namespace Server.Factions
{
private Faction m_Faction;
public BaseFactionTrapDeed(int itemID) : base(itemID)
public BaseFactionTrapDeed(int itemID= 0x14F0) : base(itemID)
{
Weight = 1.0;
LootType = LootType.Blessed;
}
public BaseFactionTrapDeed(bool createdFromDeed) : this(0x14F0)
{
}
public BaseFactionTrapDeed(Serial serial) : base(serial)
{
}
@ -120,4 +116,4 @@ namespace Server.Factions
m_Faction = Faction.ReadReference(reader);
}
}
}
}

13
Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs
View file

@ -4,16 +4,7 @@ namespace Server.Factions
{
public class FactionExplosionTrap : BaseFactionTrap
{
[Constructible]
public FactionExplosionTrap() : this(null)
{
}
public FactionExplosionTrap(Faction f) : this(f, null)
{
}
public FactionExplosionTrap(Faction f, Mobile m) : base(f, m, 0x11C1)
public FactionExplosionTrap(Faction f = null, Mobile m = null) : base(f, m, 0x11C1)
{
}
@ -81,4 +72,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

13
Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs
View file

@ -4,16 +4,7 @@ namespace Server.Factions
{
public class FactionGasTrap : BaseFactionTrap
{
[Constructible]
public FactionGasTrap() : this(null)
{
}
public FactionGasTrap(Faction f) : this(f, null)
{
}
public FactionGasTrap(Faction f, Mobile m) : base(f, m, 0x113C)
public FactionGasTrap(Faction f = null, Mobile m = null) : base(f, m, 0x113C)
{
}
@ -81,4 +72,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

17
Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs
View file

@ -4,20 +4,7 @@ namespace Server.Factions
{
public class FactionSawTrap : BaseFactionTrap
{
[Constructible]
public FactionSawTrap() : this(null)
{
}
public FactionSawTrap(Serial serial) : base(serial)
{
}
public FactionSawTrap(Faction f) : this(f, null)
{
}
public FactionSawTrap(Faction f, Mobile m) : base(f, m, 0x11AC)
public FactionSawTrap(Faction f = null, Mobile m = null) : base(f, m, 0x11AC)
{
}
@ -81,4 +68,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}

13
Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs
View file

@ -4,16 +4,7 @@ namespace Server.Factions
{
public class FactionSpikeTrap : BaseFactionTrap
{
[Constructible]
public FactionSpikeTrap() : this(null)
{
}
public FactionSpikeTrap(Faction f) : this(f, null)
{
}
public FactionSpikeTrap(Faction f, Mobile m) : base(f, m, 0x11A0)
public FactionSpikeTrap(Faction f = null, Mobile m = null) : base(f, m, 0x11A0)
{
}
@ -84,4 +75,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
}
}