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

5
Projects/Scripts/Engines/MLQuests/MLQuestPersistence.cs
View file

@ -14,8 +14,7 @@ namespace Server.Engines.MLQuests
public static void EnsureExistence()
{
if (m_Instance == null)
m_Instance = new MLQuestPersistence();
m_Instance ??= new MLQuestPersistence();
}
public override void Serialize(IGenericWriter writer)
@ -55,4 +54,4 @@ namespace Server.Engines.MLQuests
MLQuest.Deserialize(reader, version);
}
}
}
}

9
Projects/Scripts/Engines/MLQuests/MLQuestSystem.cs
View file

@ -433,8 +433,7 @@ namespace Server.Engines.MLQuests
foreach (BaseObjectiveInstance objective in instance.Objectives)
if (!objective.Expired && objective is KillObjectiveInstance kill)
{
if (type == null)
type = mob.GetType();
type ??= mob.GetType();
if (kill.AddKill(mob, type))
{
@ -477,8 +476,7 @@ namespace Server.Engines.MLQuests
instance.Quester = quester;
}
if (deliverInstance == null)
deliverInstance = instance;
deliverInstance ??= instance;
break; // don't return, we may have to complete more deliveries
}
@ -563,8 +561,7 @@ namespace Server.Engines.MLQuests
* Save first quest that reaches the CanOffer call.
* If no quests are valid at all, return this quest for displaying the CanOffer error message.
*/
if (fallback == null)
fallback = quest;
fallback ??= quest;
if (quest.CanOffer(quester, pm, context, false))
m_EligiblePool.Add(quest);

7
Projects/Scripts/Engines/MLQuests/Mobiles/SirHelper.cs
View file

@ -100,9 +100,8 @@ namespace Server.Engines.MLQuests.Mobiles
if (m.CanSee(this) && m.InLOS(this) && m.CanBeginAction(this))
{
if (shoutPacket == null)
shoutPacket = Packet.Acquire(new MessageLocalized(Serial, Body, MessageType.Regular, 946, 3,
1078099, Name, "")); // Double Click On Me For Help!
shoutPacket ??= Packet.Acquire(new MessageLocalized(Serial, Body, MessageType.Regular, 946, 3,
1078099, Name, "")); // Double Click On Me For Help!
state.Send(shoutPacket);
}
@ -135,4 +134,4 @@ namespace Server.Engines.MLQuests.Mobiles
Frozen = true;
}
}
}
}