From 34ffbea69d616b13e1098b1c73fe68ba4fdcb7d7 Mon Sep 17 00:00:00 2001
From: Evil Factory <36804725+evilfactory@users.noreply.github.com>
Date: Sat, 2 Apr 2022 20:54:54 -0300
Subject: [PATCH] MakeMethodAccessible and MakeFieldAccessible now are
 recursive, so they include private members in inherit members

---
 .../Lua/LuaClasses/LuaUserData.cs             | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaUserData.cs b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaUserData.cs
index 177f7723a..85a3da2a8 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaUserData.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaUserData.cs
@@ -110,6 +110,18 @@ namespace Barotrauma
 			return result;
 		}
 
+		private static FieldInfo FindFieldRecursively(Type type, string fieldName)
+        {
+			var field = type.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
+
+			if (field == null && type.BaseType != null)
+            {
+				return FindFieldRecursively(type.BaseType, fieldName);
+            }
+
+			return field;
+		}
+
 		public static void MakeFieldAccessible(IUserDataDescriptor IUUD, string fieldName)
 		{
 			if (IUUD == null)
@@ -121,6 +133,11 @@ namespace Barotrauma
 			var descriptor = (StandardUserDataDescriptor)IUUD;
 			var field = IUUD.Type.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
 
+			if (field == null)
+            {
+				field = FindFieldRecursively(IUUD.Type, fieldName);
+            }
+
 			if (field == null)
 			{
 				GameMain.Lua.HandleLuaException(new Exception($"Tried to make field '{fieldName}' accessible, but the field doesn't exist."));
@@ -131,6 +148,18 @@ namespace Barotrauma
 			descriptor.AddMember(fieldName, new FieldMemberDescriptor(field, InteropAccessMode.Default));
 		}
 
+		private static MethodInfo FindMethodRecursively(Type type, string methodName)
+		{
+			var method = type.GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
+
+			if (method == null && type.BaseType != null)
+			{
+				return FindMethodRecursively(type.BaseType, methodName);
+			}
+
+			return method;
+		}
+
 		public static void MakeMethodAccessible(IUserDataDescriptor IUUD, string methodName)
 		{
 			if (IUUD == null)
@@ -144,7 +173,12 @@ namespace Barotrauma
 
 			if (method == null)
 			{
-				GameMain.Lua.HandleLuaException(new Exception($"Tried to make method '{method}' accessible, but the method doesn't exist."));
+				method = FindMethodRecursively(IUUD.Type, methodName);
+			}
+
+			if (method == null)
+			{
+				GameMain.Lua.HandleLuaException(new Exception($"Tried to make method '{methodName}' accessible, but the method doesn't exist."));
 				return;
 			}