vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master

Browse Source
This commit is contained in:
Evil Factory
2021-10-27 14:41:47 -03:00
parent 8ef6ec90ca 234fb6bc06
commit bae2390eb1
450 changed files with 26043 additions and 10457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/GameMain.cs
+29 -2
View File
@@ -19,7 +19,17 @@ namespace Barotrauma
{
public static readonly Version Version = Assembly.GetEntryAssembly().GetName().Version;
public static World World;
private static World world;
public static World World
{
get
{
if (world == null) { world = new World(new Vector2(0, -9.82f)); }
return world;
}
set { world = value; }
}
public static GameSettings Config;
public static LuaSetup Lua;
@@ -125,6 +135,8 @@ namespace Barotrauma
ItemAssemblyPrefab.LoadAll();
LevelObjectPrefab.LoadAll();
BallastFloraPrefab.LoadAll(GetFilesOfType(ContentType.MapCreature));
TalentPrefab.LoadAll(GetFilesOfType(ContentType.Talents));
TalentTree.LoadAll(GetFilesOfType(ContentType.TalentTrees));
GameModePreset.Init();
DecalManager = new DecalManager();
@@ -183,6 +195,20 @@ namespace Barotrauma
}
}
public bool TryStartChildServerRelay()
{
for (int i = 0; i < CommandLineArgs.Length; i++)
{
switch (CommandLineArgs[i].Trim())
{
case "-pipes":
ChildServerRelay.Start(CommandLineArgs[i + 2], CommandLineArgs[i + 1]);
return true;
}
}
return false;
}
public void StartServer()
{
string name = "Server";
@@ -268,7 +294,7 @@ namespace Barotrauma
i++;
break;
case "-pipes":
ChildServerRelay.Start(CommandLineArgs[i + 2], CommandLineArgs[i + 1]);
//handled in TryStartChildServerRelay
i += 2;
break;
}
@@ -327,6 +353,7 @@ namespace Barotrauma
Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Items.Components.ItemComponent));
Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Hull));
TryStartChildServerRelay();
Init();
StartServer();