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

26
Scripts/Items/Containers/TreasureMapChest.cs
View file

@ -14,11 +14,11 @@ namespace Server.Items
private Timer m_Timer;
[Constructible]
public TreasureMapChest(int level) : this(null, level, false)
public TreasureMapChest(int level) : this(null, level)
{
}
public TreasureMapChest(Mobile owner, int level, bool temporary) : base(0xE40)
public TreasureMapChest(Mobile owner, int level, bool temporary = false) : base(0xE40)
{
Owner = owner;
Level = level;
@ -346,14 +346,12 @@ namespace Server.Items
if (m.AccessLevel >= AccessLevel.GameMaster || Owner == null || m == Owner)
return true;
Party p = Party.Get(Owner);
if (p != null && p.Contains(m))
if (Party.Get(Owner)?.Contains(m) == true)
return true;
Map map = Map;
if (map != null && (map.Rules & MapRules.HarmfulRestrictions) == 0)
if ((map?.Rules & MapRules.HarmfulRestrictions) == 0)
{
if (criminalAction)
m.CriminalAction(true);
@ -518,16 +516,14 @@ namespace Server.Items
AddBackground(30, 0, 240, 240, 2620);
AddHtmlLocalized(45, 15, 200, 80, 1048125, 0xFFFFFF, false,
false); // When this treasure chest is removed, any items still inside of it will be lost.
AddHtmlLocalized(45, 95, 200, 60, 1048126, 0xFFFFFF, false,
false); // Are you certain you're ready to remove this chest?
AddHtmlLocalized(45, 15, 200, 80, 1048125, 0xFFFFFF); // When this treasure chest is removed, any items still inside of it will be lost.
AddHtmlLocalized(45, 95, 200, 60, 1048126, 0xFFFFFF); // Are you certain you're ready to remove this chest?
AddButton(40, 153, 4005, 4007, 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(75, 155, 180, 40, 1048127, 0xFFFFFF, false, false); // Remove the Treasure Chest
AddButton(40, 153, 4005, 4007, 1);
AddHtmlLocalized(75, 155, 180, 40, 1048127, 0xFFFFFF); // Remove the Treasure Chest
AddButton(40, 195, 4005, 4007, 2, GumpButtonType.Reply, 0);
AddHtmlLocalized(75, 197, 180, 35, 1006045, 0xFFFFFF, false, false); // Cancel
AddButton(40, 195, 4005, 4007, 2);
AddHtmlLocalized(75, 197, 180, 35, 1006045, 0xFFFFFF); // Cancel
}
public override void OnResponse(NetState sender, RelayInfo info)
@ -575,4 +571,4 @@ namespace Server.Items
}
}
}
}
}