mirror of
https://github.com/space-wizards/RobustToolbox.git
synced 2026-02-15 03:30:53 +01:00
Fix content entry invocations, whitelist types. (#317)
This commit is contained in:
committed by
Silver
parent
22f07e3649
commit
93fd0014b4
@@ -83,6 +83,9 @@ namespace SS14.Client
|
||||
LoadContentAssembly<GameShared>("Shared");
|
||||
LoadContentAssembly<GameClient>("Client");
|
||||
|
||||
// Call Init in game assemblies.
|
||||
AssemblyLoader.BroadcastRunLevel(AssemblyLoader.RunLevel.Init);
|
||||
|
||||
//Setup Cluwne first, as the rest depends on it.
|
||||
SetupCluwne();
|
||||
CleanupSplashScreen();
|
||||
|
||||
@@ -222,15 +222,15 @@ namespace SS14.Server
|
||||
LoadContentAssembly<GameShared>("Shared");
|
||||
LoadContentAssembly<GameServer>("Server");
|
||||
|
||||
// Call Init in game assemblies.
|
||||
AssemblyLoader.BroadcastRunLevel(AssemblyLoader.RunLevel.Init);
|
||||
|
||||
// because of 'reasons' this has to be called after the last assembly is loaded
|
||||
// otherwise the prototypes will be cleared
|
||||
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
|
||||
prototypeManager.LoadDirectory(PathHelpers.ExecutableRelativeFile("Resources/Prototypes"));
|
||||
prototypeManager.Resync();
|
||||
|
||||
// Call Init in game assemblies.
|
||||
AssemblyLoader.BroadcastRunLevel(AssemblyLoader.RunLevel.Init);
|
||||
|
||||
StartLobby();
|
||||
StartGame();
|
||||
|
||||
|
||||
@@ -52,7 +52,9 @@ namespace SS14.Shared.ContentPack
|
||||
"System.Array",
|
||||
|
||||
// Primitives
|
||||
"System.Boolean",
|
||||
"System.String",
|
||||
"System.Char",
|
||||
"System.Byte",
|
||||
"System.SByte",
|
||||
"System.UInt16",
|
||||
@@ -61,10 +63,55 @@ namespace SS14.Shared.ContentPack
|
||||
"System.Int32",
|
||||
"System.UInt64",
|
||||
"System.Int64",
|
||||
"System.Single",
|
||||
"System.Double",
|
||||
"System.Decimal",
|
||||
"System.Void",
|
||||
"System.Enum",
|
||||
|
||||
// Common System things.
|
||||
"System.Collections.Generic",
|
||||
"System.Console",
|
||||
"System.Math",
|
||||
"System.ArgumentNullException",
|
||||
"System.Attribute",
|
||||
"System.AttributeUsageAttribute",
|
||||
"System.Convert",
|
||||
"System.Delegate", // Pls be good.
|
||||
"System.DivideByZeroException",
|
||||
"System.EventArgs",
|
||||
"System.Exception",
|
||||
"System.FlagsAttribute",
|
||||
"System.FormatException",
|
||||
"System.IndexOutOfRangeException",
|
||||
"System.InvalidCastException",
|
||||
"System.NotSupportedException",
|
||||
"System.NullReferenceException",
|
||||
"System.SerializableAttribute",
|
||||
"System.Tuple",
|
||||
"System.ValueTuple",
|
||||
"System.Action",
|
||||
"System.Func",
|
||||
"System.EventHandler",
|
||||
"System.IDisposable",
|
||||
"System.ICloneable",
|
||||
"System.IComparable",
|
||||
"System.IEquatable",
|
||||
|
||||
// SFML stuff.
|
||||
"SFML.Graphics.Color",
|
||||
"SFML.System.Vector2f",
|
||||
"SFML.System.Vector2i",
|
||||
"SFML.System.Vector2u",
|
||||
"SFML.System.Vector3f",
|
||||
"SFML.System.Vector3i",
|
||||
"SFML.System.Vector3u",
|
||||
|
||||
// YamlDotNet representation (prototype parsing)
|
||||
"YamlDotNet.RepresentationModel.YamlNode",
|
||||
"YamlDotNet.RepresentationModel.YamlScalarNode",
|
||||
"YamlDotNet.RepresentationModel.YamlMappingNode",
|
||||
"YamlDotNet.RepresentationModel.YamlSequenceNode"
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user