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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

2245
Projects/Scripts/Accounting/Account.cs
View file

File diff suppressed because it is too large Load diff

16
Projects/Scripts/Accounting/AccountAttackLimiter.cs
View file

@ -70,15 +70,13 @@ namespace Server.Accounting
if (accessLog.Counts >= 3)
try
{
using (StreamWriter op = new StreamWriter("throttle.log", true))
{
op.WriteLine(
"{0}\t{1}\t{2}",
DateTime.UtcNow,
ns,
accessLog.Counts
);
}
using StreamWriter op = new StreamWriter("throttle.log", true);
op.WriteLine(
"{0}\t{1}\t{2}",
DateTime.UtcNow,
ns,
accessLog.Counts
);
}
catch
{

25
Projects/Scripts/Accounting/Accounts.cs
View file

@ -21,10 +21,7 @@ namespace Server.Accounting
EventSink.WorldSave += Save;
}
public static ICollection<IAccount> GetAccounts()
{
return m_Accounts.Values;
}
public static ICollection<IAccount> GetAccounts() => m_Accounts.Values;
public static IAccount GetAccount(string username)
{
@ -75,24 +72,22 @@ namespace Server.Accounting
string filePath = Path.Combine("Saves/Accounts", "accounts.xml");
using (StreamWriter op = new StreamWriter(filePath))
{
XmlTextWriter xml = new XmlTextWriter(op) { Formatting = Formatting.Indented, IndentChar = '\t', Indentation = 1 };
using StreamWriter op = new StreamWriter(filePath);
XmlTextWriter xml = new XmlTextWriter(op) { Formatting = Formatting.Indented, IndentChar = '\t', Indentation = 1 };
xml.WriteStartDocument(true);
xml.WriteStartDocument(true);
xml.WriteStartElement("accounts");
xml.WriteStartElement("accounts");
xml.WriteAttributeString("count", m_Accounts.Count.ToString());
xml.WriteAttributeString("count", m_Accounts.Count.ToString());
foreach (Account a in GetAccounts())
a.Save(xml);
foreach (Account a in GetAccounts())
a.Save(xml);
xml.WriteEndElement();
xml.WriteEndElement();
xml.Close();
}
xml.Close();
}
}
}

80
Projects/Scripts/Accounting/Firewall.cs
View file

@ -13,20 +13,20 @@ namespace Server
string path = "firewall.cfg";
if (File.Exists(path))
using (StreamReader ip = new StreamReader(path))
{
using StreamReader ip = new StreamReader(path);
string line;
while ((line = ip.ReadLine()) != null)
{
string line;
line = line.Trim();
while ((line = ip.ReadLine()) != null)
{
line = line.Trim();
if (line.Length == 0)
continue;
if (line.Length == 0)
continue;
List.Add(ToFirewallEntry(line));
List.Add(ToFirewallEntry(line));
/*
/*
object toAdd;
IPAddress addr;
@ -37,8 +37,8 @@ namespace Server
m_Blocked.Add( toAdd.ToString() );
* */
}
}
}
}
public static List<IFirewallEntry> List{ get; }
@ -130,11 +130,9 @@ namespace Server
{
string path = "firewall.cfg";
using (StreamWriter op = new StreamWriter(path))
{
for (int i = 0; i < List.Count; ++i)
op.WriteLine(List[i]);
}
using StreamWriter op = new StreamWriter(path);
for (int i = 0; i < List.Count; ++i)
op.WriteLine(List[i]);
}
public static bool IsBlocked(IPAddress ip)
@ -177,20 +175,11 @@ namespace Server
{
private IPAddress m_Address;
public IPFirewallEntry(IPAddress address)
{
m_Address = address;
}
public IPFirewallEntry(IPAddress address) => m_Address = address;
public bool IsBlocked(IPAddress address)
{
return m_Address.Equals(address);
}
public bool IsBlocked(IPAddress address) => m_Address.Equals(address);
public override string ToString()
{
return m_Address.ToString();
}
public override string ToString() => m_Address.ToString();
public override bool Equals(object obj)
{
@ -209,10 +198,7 @@ namespace Server
return false;
}
public override int GetHashCode()
{
return m_Address.GetHashCode();
}
public override int GetHashCode() => m_Address.GetHashCode();
}
public class CIDRFirewallEntry : IFirewallEntry
@ -226,15 +212,9 @@ namespace Server
m_CIDRLength = cidrLength;
}
public bool IsBlocked(IPAddress address)
{
return Utility.IPMatchCIDR(m_CIDRPrefix, address, m_CIDRLength);
}
public bool IsBlocked(IPAddress address) => Utility.IPMatchCIDR(m_CIDRPrefix, address, m_CIDRLength);
public override string ToString()
{
return $"{m_CIDRPrefix}/{m_CIDRLength}";
}
public override string ToString() => $"{m_CIDRPrefix}/{m_CIDRLength}";
public override bool Equals(object obj)
{
@ -255,10 +235,7 @@ namespace Server
return false;
}
public override int GetHashCode()
{
return m_CIDRPrefix.GetHashCode() ^ m_CIDRLength.GetHashCode();
}
public override int GetHashCode() => m_CIDRPrefix.GetHashCode() ^ m_CIDRLength.GetHashCode();
}
public class WildcardIPFirewallEntry : IFirewallEntry
@ -267,10 +244,7 @@ namespace Server
private bool m_Valid;
public WildcardIPFirewallEntry(string entry)
{
m_Entry = entry;
}
public WildcardIPFirewallEntry(string entry) => m_Entry = entry;
public bool IsBlocked(IPAddress address)
{
@ -282,10 +256,7 @@ namespace Server
return matched;
}
public override string ToString()
{
return m_Entry;
}
public override string ToString() => m_Entry;
public override bool Equals(object obj)
{
@ -295,10 +266,7 @@ namespace Server
return obj is WildcardIPFirewallEntry entry && m_Entry.Equals(entry.m_Entry);
}
public override int GetHashCode()
{
return m_Entry.GetHashCode();
}
public override int GetHashCode() => m_Entry.GetHashCode();
}
#endregion