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

Code Cleanup & Fixes Warnings (#74)

Browse source
This commit is contained in:
Kamron Batman 2020-01-18 14:56:45 -08:00 • committed by GitHub
parent e11d1f3ad9
commit 57b14ad690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
143 changed files with 2960 additions and 3427 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Projects/Scripts/Items/Misc/Corpses/Corpse.cs
View file

@ -347,8 +347,7 @@ namespace Server.Items
if (Aggressors.Count == 0 || Items.Count == 0)
return;
if (m_InstancedItems == null)
m_InstancedItems = new Dictionary<Item, InstancedItemInfo>();
m_InstancedItems ??= new Dictionary<Item, InstancedItemInfo>();
List<Item> m_Stackables = new List<Item>();
List<Item> m_Unstackables = new List<Item>();
@ -427,8 +426,7 @@ namespace Server.Items
if (InstancedCorpse)
{
if (m_InstancedItems == null)
m_InstancedItems = new Dictionary<Item, InstancedItemInfo>();
m_InstancedItems ??= new Dictionary<Item, InstancedItemInfo>();
m_InstancedItems.Add(carved, new InstancedItemInfo(carved, carver));
}
@ -836,8 +834,7 @@ namespace Server.Items
if (item == null)
return;
if (m_RestoreTable == null)
m_RestoreTable = new Dictionary<Item, Point3D>();
m_RestoreTable ??= new Dictionary<Item, Point3D>();
m_RestoreTable[item] = loc;
}

19
Projects/Scripts/Items/Misc/EffectController.cs
View file

@ -261,13 +261,7 @@ namespace Server.Items
public void PlaySound(IEntity trigger)
{
IEntity ent = null;
if (PlaySoundAtTrigger)
ent = trigger;
if (ent == null)
ent = this;
IEntity ent = PlaySoundAtTrigger ? trigger : this;
Effects.PlaySound((ent as Item)?.GetWorldLocation() ?? ent.Location, ent.Map, SoundID);
}
@ -292,13 +286,8 @@ namespace Server.Items
public void InternalDoEffect(IEntity trigger)
{
IEntity from = m_Source, to = m_Target;
if (from == null)
from = trigger;
if (to == null)
to = trigger;
IEntity from = m_Source ?? trigger;
IEntity to = m_Target ?? trigger;
switch (EffectType)
{
@ -334,4 +323,4 @@ namespace Server.Items
}
}
}
}
}

3
Projects/Scripts/Items/Misc/Firebomb.cs
View file

@ -66,8 +66,7 @@ namespace Server.Items
from.SendLocalizedMessage(1060581); // You've already lit it! Better throw it now!
}
if (m_Users == null)
m_Users = new List<Mobile>();
m_Users ??= new List<Mobile>();
if (!m_Users.Contains(from))
m_Users.Add(from);