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

6
Projects/Scripts/Gumps/Props/PropsGump.cs
View file

@ -153,9 +153,7 @@ namespace Server.Gumps
if (parent != null)
{
if (m_Stack == null)
m_Stack = new Stack<StackEntry>();
m_Stack ??= new Stack<StackEntry>();
m_Stack.Push(parent);
}
@ -599,7 +597,7 @@ namespace Server.Gumps
{
MethodInfo parseMethod = t.GetMethod("Parse", new[] { typeof(string) });
return parseMethod.Invoke(null, new object[] { s });
return parseMethod?.Invoke(null, new object[] { s });
}
throw new Exception("bad");

9
Projects/Scripts/Gumps/Props/SetBodyGump.cs
View file

@ -127,7 +127,6 @@ namespace Server.Gumps
switch (index)
{
default:
case 0:
type = ModelBodyType.Monsters;
list = m_Monster;
break;
@ -284,12 +283,12 @@ namespace Server.Gumps
public int CompareTo(InternalEntry comp)
{
int v = Name.CompareTo(comp.Name);
if (Name == null && comp.Name == null)
return 0;
if (v == 0)
Body.CompareTo(comp.Body);
int v = Name?.CompareTo(comp.Name) ?? 1;
return v;
return v == 0 ? Body.CompareTo(comp.Body) : v;
}
}
}

14
Projects/Scripts/Gumps/Props/SetGump.cs
View file

@ -71,14 +71,12 @@ namespace Server.Gumps
bool isBody = prop.IsDefined(typeof(BodyAttribute), false);
object val = prop.GetValue(m_Object, null);
string initialText;
if (val == null)
initialText = "";
else if (val is TextDefinition definition)
initialText = definition.GetValue();
else
initialText = val.ToString();
string initialText = val switch
{
null => "",
TextDefinition definition => definition.GetValue(),
_ => val.ToString()
};
AddPage(0);