From 8d26ef859d6c08e810af5c1ed24c11ae31269058 Mon Sep 17 00:00:00 2001
From: Evil Factory <36804725+evilfactory@users.noreply.github.com>
Date: Thu, 9 Sep 2021 11:19:43 -0300
Subject: [PATCH] add holdable, registered explosion and hook fixes

---
 .../BarotraumaServer/ServerSource/Lua/LuaClasses.cs      | 9 ++++++++-
 Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs
index 8281e7c99..e49664b10 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs
@@ -339,6 +339,12 @@ namespace Barotrauma
 				return item.GetComponent<Fabricator>();
 			}
 
+			public static Holdable GetHoldableComponent(Item item)
+			{
+				if (item == null) return null;
+				return item.GetComponent<Holdable>();
+			}
+
 			public static void DispatchRespawnSub()
 			{
 				GameMain.Server.RespawnManager.DispatchShuttle();
@@ -602,7 +608,8 @@ namespace Barotrauma
 				{
 					try
 					{
-						lastResult = env.lua.Call(hf.function, args);
+						if (hf.function is Closure)
+							lastResult = env.lua.Call(hf.function, args);
 					}
 					catch (Exception e)
 					{
diff --git a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
index fcc0e73e3..60cb3b03e 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
@@ -204,6 +204,7 @@ namespace Barotrauma
 			UserData.RegisterType<WifiComponent>();
 			UserData.RegisterType<LightComponent>();
 			UserData.RegisterType<CustomInterface>();
+			UserData.RegisterType<Holdable>();
 			UserData.RegisterType<Inventory>();
 			UserData.RegisterType<CharacterInventory>();
 			UserData.RegisterType<Hull>();
@@ -221,6 +222,7 @@ namespace Barotrauma
 			UserData.RegisterType<ContentPackage>();
 			UserData.RegisterType<SubmarineInfo>();
 			UserData.RegisterType<SubmarineBody>();
+			UserData.RegisterType<Explosion>();
 
 			lua = new Script(CoreModules.Preset_SoftSandbox);