Fixes publishing
This commit is contained in:
parent
6119774dc9
commit
58be0d416c
53 changed files with 981 additions and 1225 deletions
|
|
@ -23,7 +23,7 @@ namespace Server.Engines.BulkOrders
|
|||
string type = reader.ReadString();
|
||||
|
||||
if (type != null)
|
||||
ItemType = ScriptCompiler.FindTypeByFullName(type);
|
||||
ItemType = AssemblyHandler.FindTypeByFullName(type);
|
||||
|
||||
AmountCur = reader.ReadEncodedInt();
|
||||
Number = reader.ReadEncodedInt();
|
||||
|
|
@ -53,4 +53,4 @@ namespace Server.Engines.BulkOrders
|
|||
writer.WriteEncodedInt(Graphic);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace Server.Engines.BulkOrders
|
|||
string type = reader.ReadString();
|
||||
|
||||
if (type != null)
|
||||
ItemType = ScriptCompiler.FindTypeByFullName(type);
|
||||
ItemType = AssemblyHandler.FindTypeByFullName(type);
|
||||
|
||||
RequireExceptional = reader.ReadBool();
|
||||
|
||||
|
|
@ -97,4 +97,4 @@ namespace Server.Engines.BulkOrders
|
|||
writer.WriteEncodedInt(Price);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ namespace Server.Engines.BulkOrders
|
|||
string type = reader.ReadString();
|
||||
|
||||
if ( type != null )
|
||||
realType = ScriptCompiler.FindTypeByFullName( type );
|
||||
realType = AssemblyHandler.FindTypeByFullName( type );
|
||||
|
||||
Details = new SmallBulkEntry( realType, reader.ReadInt(), reader.ReadInt() );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ namespace Server.Engines.BulkOrders
|
|||
string type = reader.ReadString();
|
||||
|
||||
if (type != null)
|
||||
Type = ScriptCompiler.FindTypeByFullName(type);
|
||||
Type = AssemblyHandler.FindTypeByFullName(type);
|
||||
|
||||
m_Number = reader.ReadInt();
|
||||
Graphic = reader.ReadInt();
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ namespace Server.Engines.BulkOrders
|
|||
|
||||
if ( split.Length >= 2 )
|
||||
{
|
||||
Type type = ScriptCompiler.FindTypeByName( split[0] );
|
||||
Type type = AssemblyHandler.FindTypeByName( split[0] );
|
||||
int graphic = Utility.ToInt32( split[split.Length - 1] );
|
||||
|
||||
if ( type != null && graphic > 0 )
|
||||
|
|
|
|||
|
|
@ -299,7 +299,7 @@ namespace Server.Engines.Doom
|
|||
if (TypeName == null)
|
||||
return;
|
||||
|
||||
Type type = ScriptCompiler.FindTypeByName(TypeName, true);
|
||||
Type type = AssemblyHandler.FindTypeByName(TypeName, true);
|
||||
|
||||
if (type == null)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -49,12 +49,12 @@ namespace Server.Factions
|
|||
m_Factions = new List<Faction>();
|
||||
m_Towns = new List<Town>();
|
||||
|
||||
Assembly[] asms = ScriptCompiler.Assemblies;
|
||||
Assembly[] asms = AssemblyHandler.Assemblies;
|
||||
|
||||
for (int i = 0; i < asms.Length; ++i)
|
||||
{
|
||||
Assembly asm = asms[i];
|
||||
TypeCache tc = ScriptCompiler.GetTypeCache(asm);
|
||||
TypeCache tc = AssemblyHandler.GetTypeCache(asm);
|
||||
Type[] types = tc.Types;
|
||||
|
||||
for (int j = 0; j < types.Length; ++j)
|
||||
|
|
@ -75,4 +75,4 @@ namespace Server.Factions
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ namespace Server.Engines.MLQuests.Items
|
|||
string typeName = reader.ReadString();
|
||||
|
||||
if (typeName != null)
|
||||
m_QuestType = ScriptCompiler.FindTypeByFullName(typeName, false);
|
||||
m_QuestType = AssemblyHandler.FindTypeByFullName(typeName, false);
|
||||
|
||||
Message = TextDefinition.Deserialize(reader);
|
||||
}
|
||||
|
|
@ -186,7 +186,7 @@ namespace Server.Engines.MLQuests.Items
|
|||
string typeName = reader.ReadString();
|
||||
|
||||
if (typeName != null)
|
||||
m_TicketType = ScriptCompiler.FindTypeByFullName(typeName, false);
|
||||
m_TicketType = AssemblyHandler.FindTypeByFullName(typeName, false);
|
||||
|
||||
Message = TextDefinition.Deserialize(reader);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace Server.Engines.MLQuests
|
|||
|
||||
string[] split = line.Split('\t');
|
||||
|
||||
Type type = ScriptCompiler.FindTypeByName(split[0]);
|
||||
Type type = AssemblyHandler.FindTypeByName(split[0]);
|
||||
|
||||
if (type == null || !baseQuestType.IsAssignableFrom(type))
|
||||
{
|
||||
|
|
@ -76,7 +76,7 @@ namespace Server.Engines.MLQuests
|
|||
|
||||
for (int i = 1; i < split.Length; ++i)
|
||||
{
|
||||
Type questerType = ScriptCompiler.FindTypeByName(split[i]);
|
||||
Type questerType = AssemblyHandler.FindTypeByName(split[i]);
|
||||
|
||||
if (questerType == null || !baseQuesterType.IsAssignableFrom(questerType))
|
||||
{
|
||||
|
|
@ -157,7 +157,7 @@ namespace Server.Engines.MLQuests
|
|||
return;
|
||||
}
|
||||
|
||||
Type index = ScriptCompiler.FindTypeByName(e.GetString(0));
|
||||
Type index = AssemblyHandler.FindTypeByName(e.GetString(0));
|
||||
|
||||
if (index == null || !Quests.TryGetValue(index, out MLQuest quest))
|
||||
{
|
||||
|
|
@ -183,7 +183,7 @@ namespace Server.Engines.MLQuests
|
|||
return;
|
||||
}
|
||||
|
||||
Type index = ScriptCompiler.FindTypeByName(e.GetString(0));
|
||||
Type index = AssemblyHandler.FindTypeByName(e.GetString(0));
|
||||
|
||||
if (index == null || !Quests.TryGetValue(index, out MLQuest quest))
|
||||
{
|
||||
|
|
@ -638,7 +638,7 @@ namespace Server.Engines.MLQuests
|
|||
if (typeName == null)
|
||||
return null; // not serialized
|
||||
|
||||
Type questType = ScriptCompiler.FindTypeByFullName(typeName);
|
||||
Type questType = AssemblyHandler.FindTypeByFullName(typeName);
|
||||
|
||||
if (questType == null)
|
||||
return null; // no longer a type
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ namespace Server.Engines.Quests
|
|||
if (fullName == null)
|
||||
return null;
|
||||
|
||||
return ScriptCompiler.FindTypeByFullName(fullName, false);
|
||||
return AssemblyHandler.FindTypeByFullName(fullName, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -185,4 +185,4 @@ namespace Server.Engines.Quests
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace Server.Mobiles
|
|||
{
|
||||
public static Type GetType(string name)
|
||||
{
|
||||
return ScriptCompiler.FindTypeByName(name);
|
||||
return AssemblyHandler.FindTypeByName(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue