From 5a3f9ebc808dee439e04d60d85ed82054794570f Mon Sep 17 00:00:00 2001
From: EvilFactory <evilfactory@users.noreply.github.com>
Date: Mon, 13 Mar 2023 13:37:24 -0300
Subject: [PATCH] 1.0 Merge fixes

---
 .../SharedSource/LuaCs/Lua/LuaConverters.cs       | 15 ---------------
 .../SharedSource/Utils/ReflectionUtils.cs         |  9 ---------
 2 files changed, 24 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaConverters.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaConverters.cs
index e8ce042b3..3e218c462 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaConverters.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaConverters.cs
@@ -254,21 +254,6 @@ namespace Barotrauma
                 return null;
             });
 
-            Script.GlobalOptions.CustomConverters.SetClrToScriptCustomConversion(typeof(None<T>), (Script v, object obj) =>
-            {
-                return UserData.Create(default(LuaNone));
-            });
-
-            Script.GlobalOptions.CustomConverters.SetClrToScriptCustomConversion(typeof(Some<T>), (Script v, object obj) =>
-            {
-                if (obj is Some<T> some)
-                {
-                    return UserData.Create(some.Value);
-                }
-
-                return null;
-            });
-
             Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(dataType, typeof(Option<T>), v =>
             {
                 if (v.UserData.Object is LuaNone)
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Utils/ReflectionUtils.cs b/Barotrauma/BarotraumaShared/SharedSource/Utils/ReflectionUtils.cs
index f727db4eb..1b647719b 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Utils/ReflectionUtils.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Utils/ReflectionUtils.cs
@@ -110,14 +110,5 @@ namespace Barotrauma
             result += $"<{string.Join(", ", t.GetGenericArguments().Select(NameWithGenerics))}>";
             return result;
         }
-
-        public static string NameWithGenerics(this Type t)
-        {
-            if (!t.IsGenericType) { return t.Name; }
-            
-            string result = t.Name[..t.Name.IndexOf('`')];
-            result += $"<{string.Join(", ", t.GetGenericArguments().Select(NameWithGenerics))}>";
-            return result;
-        }
     }
 }