This commit is contained in:
Evil Factory
2021-08-10 23:34:07 -03:00
parent 694f7adcc6
commit 06f40fa368
4 changed files with 5 additions and 2 deletions
@@ -238,6 +238,8 @@ namespace Barotrauma
public static Submarine GetRespawnSub() public static Submarine GetRespawnSub()
{ {
if (GameMain.Server.RespawnManager == null)
return null;
return GameMain.Server.RespawnManager.RespawnShuttle; return GameMain.Server.RespawnManager.RespawnShuttle;
} }
@@ -137,6 +137,8 @@ namespace Barotrauma
UserData.RegisterType<AttackResult>(); UserData.RegisterType<AttackResult>();
UserData.RegisterType<Entity>(); UserData.RegisterType<Entity>();
UserData.RegisterType<MapEntity>(); UserData.RegisterType<MapEntity>();
UserData.RegisterType<CauseOfDeath>();
UserData.RegisterType<CharacterTeamType>();
lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.LoadMethods); lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.LoadMethods);
@@ -117,7 +117,7 @@ namespace Barotrauma.Networking
return; return;
} }
var should = GameMain.Lua.hook.Call("chatMessage", new DynValue[] { DynValue.NewString(txt), UserData.Create(c) }); var should = GameMain.Lua.hook.Call("chatMessage", new DynValue[] { DynValue.NewString(txt), UserData.Create(c), UserData.Create(type) });
if(should != null) if(should != null)
@@ -2226,7 +2226,6 @@ namespace Barotrauma
if (condition == 0.0f) { return; } if (condition == 0.0f) { return; }
#if SERVER #if SERVER
var should = GameMain.Lua.hook.Call("itemUse", new DynValue[] { LuaSetup.CreateUserDataSafe(this), LuaSetup.CreateUserDataSafe(character), LuaSetup.CreateUserDataSafe(targetLimb) }); var should = GameMain.Lua.hook.Call("itemUse", new DynValue[] { LuaSetup.CreateUserDataSafe(this), LuaSetup.CreateUserDataSafe(character), LuaSetup.CreateUserDataSafe(targetLimb) });