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

3
Projects/Scripts/Misc/AOS.cs
View file

@ -1019,8 +1019,7 @@ namespace Server
if (!GetValues(i, out SkillName skill, out double bonus))
continue;
if (m_Mods == null)
m_Mods = new List<SkillMod>();
m_Mods ??= new List<SkillMod>();
SkillMod sk = new DefaultSkillMod(skill, true, bonus);
sk.ObeyCap = true;

2
Projects/Scripts/Misc/Email.cs
View file

@ -40,7 +40,7 @@ namespace Server.Misc
writer.WriteLine(@$"
ModernUO Speech Log Page - {pageType}
From: '{sender.RawName}', Account: '{((sender.Account is Account accSend) ? accSend.Username : " ??? ")}'
From: '{sender.RawName}', Account: '{(sender.Account is Account accSend ? accSend.Username : " ??? ")}'
Location: {sender.Location} [{sender.Map}]
Sent on: {time.Year}/{time.Month:00}/{time.Day:00} {time.Hour}:{time.Minute:00}:{time.Second:00}

35
Projects/Scripts/Misc/Guild.cs
View file

@ -345,9 +345,7 @@ namespace Server.Guilds
if (state != null)
{
if (p == null)
p = Packet.Acquire(new UnicodeMessage(from.Serial, from.Body, MessageType.Alliance, hue, 3,
from.Language, from.Name, text));
p ??= Packet.Acquire(new UnicodeMessage(from.Serial, from.Body, MessageType.Alliance, hue, 3, from.Language, from.Name, text));
state.Send(p);
}
@ -936,10 +934,9 @@ namespace Server.Guilds
if (!NewGuildSystem)
return;
if (killer == null)
killer = victim.FindMostRecentDamager(false);
killer ??= victim.FindMostRecentDamager(false);
if (killer == null || victim.Guild == null || killer.Guild == null)
if (killer?.Guild == null || victim.Guild == null)
return;
Guild victimGuild = GetAllianceLeader(victim.Guild as Guild);
@ -1148,24 +1145,10 @@ namespace Server.Guilds
}
}
if (AllyDeclarations == null)
AllyDeclarations = new List<Guild>();
if (AllyInvitations == null)
AllyInvitations = new List<Guild>();
if (AcceptedWars == null)
AcceptedWars = new List<WarDeclaration>();
if (PendingWars == null)
PendingWars = new List<WarDeclaration>();
/*
if ( ( !NewGuildSystem && m_Guildstone == null )|| m_Members.Count == 0 )
Disband();
*/
AllyDeclarations ??= new List<Guild>();
AllyInvitations ??= new List<Guild>();
AcceptedWars ??= new List<WarDeclaration>();
PendingWars ??= new List<WarDeclaration>();
Timer.DelayCall(TimeSpan.Zero, VerifyGuild_Callback);
}
@ -1343,9 +1326,7 @@ namespace Server.Guilds
if (state != null)
{
if (p == null)
p = Packet.Acquire(new UnicodeMessage(from.Serial, from.Body, MessageType.Guild, hue, 3,
from.Language, from.Name, text));
p ??= Packet.Acquire(new UnicodeMessage(from.Serial, from.Body, MessageType.Guild, hue, 3, from.Language, from.Name, text));
state.Send(p);
}

13
Projects/Scripts/Misc/ShardPoller.cs
View file

@ -465,8 +465,7 @@ namespace Server.Misc
public void QueuePoll(ShardPoller poller)
{
if (m_Polls == null)
m_Polls = new Queue<ShardPoller>(4);
m_Polls ??= new Queue<ShardPoller>(4);
m_Polls.Enqueue(poller);
}
@ -479,11 +478,15 @@ namespace Server.Misc
{
if (m_Polls?.Count > 0)
{
ShardPoller poller = m_Polls.Dequeue();
ShardPoller shardPoller = m_Polls.Dequeue();
if (poller != null)
if (shardPoller != null)
Timer.DelayCall(TimeSpan.FromSeconds(1.0),
() => m_From.SendGump(new ShardPollGump(m_From, poller, false, m_Polls)));
data =>
{
var (mobile, poller, polls) = data;
m_From.SendGump(new ShardPollGump(mobile, poller, false, polls));
}, (m_From, shardPoller, m_Polls));
}
if (info.ButtonID == 1)

1
Projects/Scripts/Misc/SocketOptions.cs
View file

@ -1,5 +1,4 @@
using System.Net;
using System.Net.Sockets;
namespace Server
{

6
Projects/Scripts/Misc/VendorGenerator.cs
View file

@ -413,9 +413,9 @@ namespace Server
floor.Add(p);
for (int xo = -1; xo <= 1; ++xo)
for (int yo = -1; yo <= 1; ++yo)
if ((xo != 0 || yo != 0) && IsFloor(map, x + xo, y + yo, false))
RecurseFindFloor(map, x + xo, y + yo, floor);
for (int yo = -1; yo <= 1; ++yo)
if ((xo != 0 || yo != 0) && IsFloor(map, x + xo, y + yo, false))
RecurseFindFloor(map, x + xo, y + yo, floor);
}
[Flags]