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

Fixes publishing

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 22:02:19 -07:00
parent 6119774dc9
commit 58be0d416c
No known key found for this signature in database
GPG key ID: 5C9DFD15804B6BB8
53 changed files with 981 additions and 1225 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Scripts/Commands/Add.cs
View file

@ -101,7 +101,7 @@ namespace Server.Commands
break;
}
Type type = ScriptCompiler.FindTypeByName(name);
Type type = AssemblyHandler.FindTypeByName(name);
if (!IsEntity(type))
{
@ -241,7 +241,7 @@ namespace Server.Commands
try
{
if (IsEnum(type)) return Enum.Parse(type, value, true);
if (IsType(type)) return ScriptCompiler.FindTypeByName(value);
if (IsType(type)) return AssemblyHandler.FindTypeByName(value);
if (IsParsable(type)) return ParseParsable(type, value);
object obj = value;

2
Projects/Scripts/Commands/Decorate.cs
View file

@ -1016,7 +1016,7 @@ namespace Server.Commands
int indexOf = line.IndexOf(' ');
list.m_Type = ScriptCompiler.FindTypeByName(line.Substring(0, indexOf++), true);
list.m_Type = AssemblyHandler.FindTypeByName(line.Substring(0, indexOf++), true);
if (list.m_Type == null)
throw new ArgumentException($"Type not found for header: '{line}'");

2
Projects/Scripts/Commands/DecorateMag.cs
View file

@ -1014,7 +1014,7 @@ namespace Server.Commands
int indexOf = line.IndexOf(' ');
list.m_Type = ScriptCompiler.FindTypeByName(line.Substring(0, indexOf++), true);
list.m_Type = AssemblyHandler.FindTypeByName(line.Substring(0, indexOf++), true);
if (list.m_Type == null)
throw new ArgumentException($"Type not found for header: '{line}'");

2
Projects/Scripts/Commands/Docs.cs
View file

@ -667,7 +667,7 @@ namespace Server.Commands
List<Assembly> assemblies = new List<Assembly> { Core.Assembly };
foreach (Assembly asm in ScriptCompiler.Assemblies)
foreach (Assembly asm in AssemblyHandler.Assemblies)
assemblies.Add(asm);
Assembly[] asms = assemblies.ToArray();

6
Projects/Scripts/Commands/GenCategorization.cs
View file

@ -144,8 +144,8 @@ namespace Server.Commands
AddTypes(Core.Assembly, types);
for (int i = 0; i < ScriptCompiler.Assemblies.Length; ++i)
AddTypes(ScriptCompiler.Assemblies[i], types);
for (int i = 0; i < AssemblyHandler.Assemblies.Length; ++i)
AddTypes(AssemblyHandler.Assemblies[i], types);
m_RootItems = Load(types, "Data/items.cfg");
m_RootMobiles = Load(types, "Data/mobiles.cfg");
@ -315,7 +315,7 @@ namespace Server.Commands
for (int i = 0; i < split.Length; ++i)
{
Type type = ScriptCompiler.FindTypeByName(split[i].Trim());
Type type = AssemblyHandler.FindTypeByName(split[i].Trim());
if (type == null)
Console.WriteLine("Match type not found ('{0}')", split[i].Trim());

4
Projects/Scripts/Commands/Generic/Commands/Commands.cs
View file

@ -444,7 +444,7 @@ namespace Server.Commands.Generic
{
if (e.Length >= 1)
{
Type t = ScriptCompiler.FindTypeByName(e.GetString(0));
Type t = AssemblyHandler.FindTypeByName(e.GetString(0));
if (t == null)
{
@ -1108,4 +1108,4 @@ namespace Server.Commands.Generic
LogFailure("No house was found.");
}
}
}
}

2
Projects/Scripts/Commands/Generic/Implementors/ObjectConditional.cs
View file

@ -90,7 +90,7 @@ namespace Server.Commands.Generic
int index = 0;
Type objectType = ScriptCompiler.FindTypeByName(args[offset + index], true);
Type objectType = AssemblyHandler.FindTypeByName(args[offset + index], true);
if (objectType == null)
throw new Exception($"No type with that name ({args[offset + index]}) was found.");

2
Projects/Scripts/Commands/Profiling.cs
View file

@ -290,7 +290,7 @@ namespace Server.Commands
int count = bin.ReadInt32();
for (int i = 0; i < count; ++i)
types.Add(ScriptCompiler.FindTypeByFullName(bin.ReadString()));
types.Add(AssemblyHandler.FindTypeByFullName(bin.ReadString()));
}
long total = 0;

2
Projects/Scripts/Commands/Properties.cs
View file

@ -418,7 +418,7 @@ namespace Server.Commands
else if (IsType(type))
try
{
toSet = ScriptCompiler.FindTypeByName(value);
toSet = AssemblyHandler.FindTypeByName(value);
if (toSet == null)
return "No type with that name was found.";