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

2
Projects/Server/Network/MessagePump.cs
View file

@ -23,8 +23,6 @@ using System;
using System.Buffers;
using System.Collections.Concurrent;
using System.Net;
using System.Threading.Tasks;
using SignalR;
namespace Server.Network
{

18
Projects/Server/Network/NetState.cs
View file

@ -30,7 +30,6 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections;
using Server.Accounting;
using Server.Diagnostics;
using Server.Gumps;
using Server.HuePickers;
using Server.Items;
@ -302,8 +301,7 @@ namespace Server.Network
public void AddMenu(IMenu menu)
{
if (Menus == null)
Menus = new List<IMenu>();
Menus ??= new List<IMenu>();
if (Menus.Count < MenuCap)
Menus.Add(menu);
@ -331,8 +329,7 @@ namespace Server.Network
public void AddHuePicker(HuePicker huePicker)
{
if (HuePickers == null)
HuePickers = new List<HuePicker>();
HuePickers ??= new List<HuePicker>();
if (HuePickers.Count < HuePickerCap)
HuePickers.Add(huePicker);
@ -360,8 +357,7 @@ namespace Server.Network
public void AddGump(Gump gump)
{
if (Gumps == null)
Gumps = new List<Gump>();
Gumps ??= new List<Gump>();
if (Gumps.Count < GumpCap)
Gumps.Add(gump);
@ -435,7 +431,9 @@ namespace Server.Network
ConnectedOn = DateTime.UtcNow;
Console.WriteLine("Client: {0}: Connected. [{1} Online]", this, Instances.Count);
_ = ProcessRecvs(pump);
#pragma warning disable 4014
ProcessRecvs(pump);
#pragma warning restore 4014
CreatedCallback?.Invoke(this);
}
@ -566,9 +564,7 @@ namespace Server.Network
private int m_Disposing;
public bool IsDisposing { get => m_Disposing != 0;
private set => m_Disposing = value ? 1 : 0;
}
public bool IsDisposing => m_Disposing != 0;
public virtual void Dispose()
{

3
Projects/Server/Network/PacketHandlers.cs
View file

@ -2092,8 +2092,7 @@ namespace Server.Network
race = Race.Races[(byte)(genderRace / 2)];
}
if (race == null)
race = Race.DefaultRace;
race ??= Race.DefaultRace;
CityInfo[] info = state.CityInfo;
IAccount a = state.Account;

58
Projects/Server/Network/Packets.cs
View file

@ -165,7 +165,7 @@ namespace Server.Network
public DisplaySecureTrade(Mobile them, Container first, Container second, string name)
: base(0x6F)
{
if (name == null) name = "";
name ??= "";
EnsureCapacity(18 + name.Length);
@ -405,13 +405,9 @@ namespace Server.Network
m_Stream.Write((ushort)state.Item.Amount);
m_Stream.Write((ushort)state.Price);
string name = state.Item.Name;
if (name == null || (name = name.Trim()).Length <= 0)
name = state.Name;
if (name == null)
name = "";
string name = state.Item.Name?.Trim();
if (string.IsNullOrWhiteSpace(name))
name = state.Name ?? "";
m_Stream.Write((ushort)name.Length);
m_Stream.WriteAsciiFixed(name, (ushort)name.Length);
@ -979,14 +975,9 @@ namespace Server.Network
{
public DisplayProfile(bool realSerial, Mobile m, string header, string body, string footer) : base(0xB8)
{
if (header == null)
header = "";
if (body == null)
body = "";
if (footer == null)
footer = "";
header ??= "";
body ??= "";
footer ??= "";
EnsureCapacity(12 + header.Length + footer.Length * 2 + body.Length * 2);
@ -2104,7 +2095,7 @@ namespace Server.Network
{
public LaunchBrowser(string url) : base(0xA5)
{
if (url == null) url = "";
url ??= "";
EnsureCapacity(4 + url.Length);
@ -2121,8 +2112,8 @@ namespace Server.Network
public MessageLocalized(Serial serial, int graphic, MessageType type, int hue, int font, int number, string name,
string args) : base(0xC1)
{
if (name == null) name = "";
if (args == null) args = "";
name ??= "";
args ??= "";
if (hue == 0)
hue = 0x3B2;
@ -2570,7 +2561,7 @@ namespace Server.Network
{
public DisplayGump(Gump g, string layout, string[] text) : base(0xB0)
{
if (layout == null) layout = "";
layout ??= "";
EnsureCapacity(256);
@ -2673,7 +2664,7 @@ namespace Server.Network
{
public ScrollMessage(int type, int tip, string text) : base(0xA6)
{
if (text == null) text = "";
text ??= "";
EnsureCapacity(10 + text.Length);
@ -2755,12 +2746,12 @@ namespace Server.Network
flags |= Value;
if (ns.Account is IAccount acct && acct.Limit >= 6)
if (ns.Account.Limit >= 6)
{
flags |= FeatureFlags.LiveAccount;
flags &= ~FeatureFlags.UOTD;
if (acct.Limit > 6)
if (ns.Account.Limit > 6)
flags |= FeatureFlags.SeventhCharacterSlot;
else
flags |= FeatureFlags.SixthCharacterSlot;
@ -3618,11 +3609,8 @@ namespace Server.Network
public AsciiMessage(Serial serial, int graphic, MessageType type, int hue, int font, string name, string text) :
base(0x1C)
{
if (name == null)
name = "";
if (text == null)
text = "";
name ??= "";
text ??= "";
if (hue == 0)
hue = 0x3B2;
@ -3645,8 +3633,8 @@ namespace Server.Network
string text) : base(0xAE)
{
if (string.IsNullOrEmpty(lang)) lang = "ENU";
if (name == null) name = "";
if (text == null) text = "";
name ??= "";
text ??= "";
if (hue == 0)
hue = 0x3B2;
@ -4051,9 +4039,9 @@ namespace Server.Network
public MessageLocalizedAffix(Serial serial, int graphic, MessageType messageType, int hue, int font, int number,
string name, AffixType affixType, string affix, string args) : base(0xCC)
{
if (name == null) name = "";
if (affix == null) affix = "";
if (args == null) args = "";
name ??= "";
affix ??= "";
args ??= "";
if (hue == 0)
hue = 0x3B2;
@ -4128,8 +4116,8 @@ namespace Server.Network
{
public DisplaySignGump(Serial serial, int gumpID, string unknown, string caption) : base(0x8B)
{
if (unknown == null) unknown = "";
if (caption == null) caption = "";
unknown ??= "";
caption ??= "";
EnsureCapacity(16 + unknown.Length + caption.Length);