Merge branch 'rc' into release

altmp · Sep 5, 2024 · fb66dc2 · fb66dc2
2 parents 41d34ee + c944968
commit fb66dc2
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/api/AltV.Net.Shared/Utils/Utils.cs b/api/AltV.Net.Shared/Utils/Utils.cs
@@ -76,7 +76,13 @@ public static T GetCastedMValue<T>(MValueConst mValue)
                                 }
                                 else
                                 {
-                                    resultList.GetType().GetMethod("Add").Invoke(resultList, [Convert.ChangeType(item, type)]);
+                                    var val = item;
+                                    if (type != typeof(object))
+                                    {
+                                        val = Convert.ChangeType(val, type);
+                                    }
+
+                                    resultList.GetType().GetMethod("Add").Invoke(resultList, [val]);
                                 }
                             }
                         }
@@ -125,8 +131,12 @@ public static T GetCastedMValue<T>(MValueConst mValue)
 
                         foreach (var kvp in sourceDictionary)
                         {
-                            object value = Convert.ChangeType(kvp.Value, valueType);
-                            resultDictionary.GetType().GetMethod("Add").Invoke(resultDictionary, new object[] { kvp.Key, value });
+                            var val = kvp.Value;
+                            if (valueType != typeof(object))
+                            {
+                                val = Convert.ChangeType(val, valueType);
+                            }
+                            resultDictionary.GetType().GetMethod("Add").Invoke(resultDictionary, new object[] { kvp.Key, val });
                         }
 
                         return resultDictionary;