From 83d1c29917409d0186b20948c83a109a99d9cf7d Mon Sep 17 00:00:00 2001
From: zhurengong <2731412072@qq.com>
Date: Tue, 9 Nov 2021 00:16:48 +0800
Subject: [PATCH] move the registration of generic types to the lua side in a
 simple way

---
 Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua      | 8 ++++++++
 Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
index 5f86c37b6..a8c284a36 100644
--- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
+++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
@@ -114,6 +114,14 @@ RegisterBarotrauma("Camera")
 RegisterBarotrauma("InputType")
 RegisterBarotrauma("Key")
 
+RegisterBarotrauma("PrefabCollection`1[[Barotrauma.ItemPrefab]]")
+RegisterBarotrauma("PrefabCollection`1[[Barotrauma.JobPrefab]]")
+RegisterBarotrauma("PrefabCollection`1[[Barotrauma.CharacterPrefab]]")
+RegisterBarotrauma("PrefabCollection`1[[Barotrauma.AfflictionPrefab]]")
+RegisterBarotrauma("PrefabCollection`1[[Barotrauma.TalentPrefab]]")
+
+RegisterBarotrauma("Pair`2[[Barotrauma.JobPrefab],[System.Int32]]")
+
 AddCallMetaMember(RegisterBarotrauma("CharacterInfo"))
 AddCallMetaMember(RegisterBarotrauma("Items.Components.Signal"))
 AddCallMetaMember(RegisterBarotrauma("SubmarineInfo"))
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs
index 9686b150b..e3fe2d9e9 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs
@@ -323,13 +323,7 @@ namespace Barotrauma
 			UserData.RegisterType<LuaHook.HookMethodType>();
 			UserData.RegisterType<IUserDataDescriptor>();
 
-			UserData.RegisterType<PrefabCollection<ItemPrefab>>();
-			UserData.RegisterType<PrefabCollection<JobPrefab>>();
-			UserData.RegisterType<PrefabCollection<CharacterPrefab>>();
-			UserData.RegisterType<PrefabCollection<AfflictionPrefab>>();
-			UserData.RegisterType<PrefabCollection<TalentPrefab>>();
 
-			UserData.RegisterType<Pair<JobPrefab, int>>();
 
 #if SERVER