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

40
Scripts/Multis/ComponentVerification.cs
View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
@ -33,26 +34,17 @@ namespace Server.Multis
public bool IsItemValid(int itemID)
{
if (itemID <= 0 || itemID >= m_ItemTable.Length)
return false;
return CheckValidity(m_ItemTable[itemID]);
return itemID > 0 && itemID < m_ItemTable.Length && CheckValidity(m_ItemTable[itemID]);
}
public bool IsMultiValid(int multiID)
{
if (multiID <= 0 || multiID >= m_MultiTable.Length)
return false;
return CheckValidity(m_MultiTable[multiID]);
return multiID > 0 && multiID < m_MultiTable.Length && CheckValidity(m_MultiTable[multiID]);
}
public bool CheckValidity(int val)
{
if (val == -1)
return false;
return val == 0 || ((int)ExpansionInfo.CoreExpansion.CustomHousingFlag & val) != 0;
return val != -1 && (val == 0 || ((int)ExpansionInfo.CoreExpansion.CustomHousingFlag & val) != 0);
}
private int[] CreateTable(int length)
@ -172,10 +164,8 @@ namespace Server.Multis
while ((line = ip.ReadLine()) != null)
{
if (line.Length == 0)
continue;
return line.Split('\t');
if (line.Length > 0)
return line.Split('\t');
}
return null;
@ -212,16 +202,7 @@ namespace Server.Multis
public object this[string name] => this[Spreadsheet.GetColumnID(name)];
public object this[int id]
{
get
{
if (id < 0)
return null;
return Data[id];
}
}
public object this[int id] => id < 0 ? null : Data[id];
public int GetInt32(string name)
{
@ -235,10 +216,7 @@ namespace Server.Multis
public int GetInt32(object obj)
{
if (obj is int i)
return i;
return 0;
return Convert.ToInt32(obj);
}
public string GetString(string name)
@ -246,4 +224,4 @@ namespace Server.Multis
return this[name] as string;
}
}
}
}