PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Fix for MP

Browse Source
This commit is contained in:
Brant Martin
2018-05-16 07:09:05 -04:00
parent d8915d1893
commit 38d2f1b62e
22 changed files with 57 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Torch/Patches/ObjectFactoryInitPatch.cs
View File

@@ -31,6 +31,7 @@ namespace Torch.Patches
internal static void ForceRegisterAssemblies()
{
var userAssemblies = MyPlugins.UserAssemblies;
// static MyEntities() called by MySandboxGame.ForceStaticCtor
RuntimeHelpers.RunClassConstructor(typeof(MyEntities).TypeHandle);
{
@@ -38,7 +39,14 @@ namespace Torch.Patches
ObjectFactory_RegisterFromAssemblySafe(factory, typeof(MySandboxGame).Assembly); // calling assembly
ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.GameAssembly);
ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.SandboxAssembly);
ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.UserAssembly);
//ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.UserAssembly);
if (userAssemblies != null)
{
foreach (var assembly in userAssemblies)
{
ObjectFactory_RegisterFromAssemblySafe(factory, assembly);
}
}
}
// static MyGuiManager():
@@ -51,7 +59,14 @@ namespace Torch.Patches
ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.SandboxAssembly);
ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.GameAssembly);
ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.SandboxGameAssembly);
ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.UserAssembly);
//ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.UserAssembly);
if (userAssemblies != null)
{
foreach (var assembly in userAssemblies)
{
ComponentTypeFactory_RegisterFromAssemblySafe(assembly);
}
}
}
// static MyObjectPoolManager()