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

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

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

@ -36,61 +36,61 @@ namespace Server.Engines.MLQuests
Type baseQuesterType = typeof(IQuestGiver);
if (File.Exists(cfgPath))
using (StreamReader sr = new StreamReader(cfgPath))
{
using StreamReader sr = new StreamReader(cfgPath);
string line;
while ((line = sr.ReadLine()) != null)
{
string line;
if (line.Length == 0 || line.StartsWith("#"))
continue;
while ((line = sr.ReadLine()) != null)
string[] split = line.Split('\t');
Type type = AssemblyHandler.FindTypeByName(split[0]);
if (type == null || !baseQuestType.IsAssignableFrom(type))
{
if (line.Length == 0 || line.StartsWith("#"))
continue;
if (Debug)
Console.WriteLine("Warning: {1} quest type '{0}'", split[0],
type == null ? "Unknown" : "Invalid");
string[] split = line.Split('\t');
continue;
}
Type type = AssemblyHandler.FindTypeByName(split[0]);
MLQuest quest = null;
if (type == null || !baseQuestType.IsAssignableFrom(type))
try
{
quest = Activator.CreateInstance(type) as MLQuest;
}
catch
{
// ignored
}
if (quest == null)
continue;
Register(type, quest);
for (int i = 1; i < split.Length; ++i)
{
Type questerType = AssemblyHandler.FindTypeByName(split[i]);
if (questerType == null || !baseQuesterType.IsAssignableFrom(questerType))
{
if (Debug)
Console.WriteLine("Warning: {1} quest type '{0}'", split[0],
type == null ? "Unknown" : "Invalid");
Console.WriteLine("Warning: {1} quester type '{0}'", split[i],
questerType == null ? "Unknown" : "Invalid");
continue;
}
MLQuest quest = null;
try
{
quest = Activator.CreateInstance(type) as MLQuest;
}
catch
{
// ignored
}
if (quest == null)
continue;
Register(type, quest);
for (int i = 1; i < split.Length; ++i)
{
Type questerType = AssemblyHandler.FindTypeByName(split[i]);
if (questerType == null || !baseQuesterType.IsAssignableFrom(questerType))
{
if (Debug)
Console.WriteLine("Warning: {1} quester type '{0}'", split[i],
questerType == null ? "Unknown" : "Invalid");
continue;
}
RegisterQuestGiver(quest, questerType);
}
RegisterQuestGiver(quest, questerType);
}
}
}
}
public static bool Enabled => Core.ML;
@ -653,10 +653,7 @@ namespace Server.Engines.MLQuests
return result;
}
public static List<MLQuest> FindQuestList(Type questerType)
{
return QuestGivers.TryGetValue(questerType, out List<MLQuest> result) ? result : EmptyList;
}
public static List<MLQuest> FindQuestList(Type questerType) => QuestGivers.TryGetValue(questerType, out List<MLQuest> result) ? result : EmptyList;
public class ViewQuestsCommand : BaseCommand
{