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

20
Projects/Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Server.Gumps;
using Server.Items;
@ -113,6 +114,9 @@ namespace Server.Engines.ConPVP
{
CTFTeamInfo teamInfo = entries[i] as CTFTeamInfo;
if (teamInfo == null)
continue;
AddImage(30, 70 + i * 75, 10152);
AddImage(30, 85 + i * 75, 10151);
AddImage(30, 100 + i * 75, 10151);
@ -878,7 +882,7 @@ namespace Server.Engines.ConPVP
private void DelayBounce_Callback(Mobile mob, Container corpse)
{
DuelPlayer dp = mob is PlayerMobile mobile ? mobile.DuelPlayer : null;
DuelPlayer dp = (mob as PlayerMobile)?.DuelPlayer;
m_Context.RemoveAggressions(mob);
@ -943,15 +947,8 @@ namespace Server.Engines.ConPVP
if (ourFlagCarrier != null && GetTeamInfo(ourFlagCarrier) == teamInfo)
{
for (int j = 0; j < ourFlagCarrier.Aggressors.Count; ++j)
{
if (!(ourFlagCarrier.Aggressors[j] is AggressorInfo aggr) ||
aggr.Defender != ourFlagCarrier || aggr.Attacker != mob)
continue;
if (ourFlagCarrier.Aggressors.Any(aggr => aggr.Defender == ourFlagCarrier && aggr.Attacker == mob))
playerInfo.Score += 2; // helped defend guy capturing enemy flag
break;
}
if (mob.Map == ourFlagCarrier.Map && ourFlagCarrier.InRange(mob, 12))
playerInfo.Score += 1; // helped defend guy capturing enemy flag
@ -1143,7 +1140,7 @@ namespace Server.Engines.ConPVP
}
}
if (i == winner.TeamID)
if (i == winner?.TeamID)
continue;
for (int j = 0; j < p.Players.Length; ++j)
@ -1151,7 +1148,8 @@ namespace Server.Engines.ConPVP
p.Players[j].Eliminated = true;
}
m_Context.Finish(m_Context.Participants[winner.TeamID]);
if (winner != null)
m_Context.Finish(m_Context.Participants[winner.TeamID]);
}
public override void OnStop()