From d585b21b30b7d2115a8040e03ab9ed79b3fe1d8b Mon Sep 17 00:00:00 2001
From: Ryan Gregory <ryanzgreg@gmail.com>
Date: Sun, 11 Feb 2024 11:05:55 -0500
Subject: [PATCH] Hide Stacktrace Directory; Resolve NetworkObject List Errors
 (#24)

* Hide Stacktrace Directory; Resolve NetworkObject List Errors

* Fix path & netvar set error
---
 LethalNetworkAPI/LethalNetworkAPI.csproj      | 10 ++--
 .../Serializable/LethalNetworkSerializer.cs   | 21 ++-------
 .../Serializable/NetworkBehaviourFormatter.cs | 29 ++++++++++++
 .../Serializable/NetworkObjectFormatter.cs    | 47 +++++++++++++++++++
 .../Variable/LethalNetworkVariable.cs         | 11 ++---
 5 files changed, 91 insertions(+), 27 deletions(-)
 create mode 100644 LethalNetworkAPI/Serializable/NetworkBehaviourFormatter.cs
 create mode 100644 LethalNetworkAPI/Serializable/NetworkObjectFormatter.cs

diff --git a/LethalNetworkAPI/LethalNetworkAPI.csproj b/LethalNetworkAPI/LethalNetworkAPI.csproj
index 0fcc27b..43ffac1 100644
--- a/LethalNetworkAPI/LethalNetworkAPI.csproj
+++ b/LethalNetworkAPI/LethalNetworkAPI.csproj
@@ -23,15 +23,17 @@
         <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="$(ProjectDir)../README.md" Pack="true" PackagePath="/"/>
-    </ItemGroup>
-
+    <!-- Embedded Debug -->
     <PropertyGroup>
         <DebugSymbols>true</DebugSymbols>
         <DebugType>embedded</DebugType>
+        <PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Include="$(ProjectDir)../README.md" Pack="true" PackagePath="/"/>
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="BepInEx.Analyzers" Version="1.*" PrivateAssets="all"/>
         <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all"/>
diff --git a/LethalNetworkAPI/Serializable/LethalNetworkSerializer.cs b/LethalNetworkAPI/Serializable/LethalNetworkSerializer.cs
index 3f9df34..ff7af2b 100644
--- a/LethalNetworkAPI/Serializable/LethalNetworkSerializer.cs
+++ b/LethalNetworkAPI/Serializable/LethalNetworkSerializer.cs
@@ -10,32 +10,19 @@ internal static class LethalNetworkSerializer
     internal static byte[] Serialize<T>(T value)
     {
 #if NETSTANDARD2_1
-        return value switch
-        {
-            GameObject gameObject => SerializationUtility.SerializeValue((NetworkObjectReference)gameObject, DataFormat.Binary),
-            NetworkObject networkObject => SerializationUtility.SerializeValue((NetworkObjectReference)networkObject, DataFormat.Binary),
-            NetworkBehaviour gameObject => SerializationUtility.SerializeValue((NetworkBehaviourReference)gameObject, DataFormat.Binary),
-            _ => SerializationUtility.SerializeValue(value, DataFormat.Binary)
-        };
+        return SerializationUtility.SerializeValue(value, DataFormat.Binary);
 #else
-        return [];        
+        return [];
 #endif
     }
     
     internal static T Deserialize<T>(byte[] data)
     {
 #if NETSTANDARD2_1
-        T type = default!;
-        return type switch
-        {
-            GameObject => (T)(object)(GameObject)SerializationUtility.DeserializeValue<NetworkObjectReference>(data, DataFormat.Binary),
-            NetworkObject => (T)(object)(NetworkObject)SerializationUtility.DeserializeValue<NetworkObjectReference>(data, DataFormat.Binary),
-            NetworkBehaviour => (T)(object)(NetworkBehaviour)SerializationUtility.DeserializeValue<NetworkBehaviourReference>(data, DataFormat.Binary),
-            _ => SerializationUtility.DeserializeValue<T>(data, DataFormat.Binary)
-        };
+        return SerializationUtility.DeserializeValue<T>(data, DataFormat.Binary);
 #else
         T test = default!;
-        return test;        
+        return test;
 #endif
     }
 }
\ No newline at end of file
diff --git a/LethalNetworkAPI/Serializable/NetworkBehaviourFormatter.cs b/LethalNetworkAPI/Serializable/NetworkBehaviourFormatter.cs
new file mode 100644
index 0000000..1e41c9c
--- /dev/null
+++ b/LethalNetworkAPI/Serializable/NetworkBehaviourFormatter.cs
@@ -0,0 +1,29 @@
+using LethalNetworkAPI.Serializable;
+
+#if NETSTANDARD2_1
+using OdinSerializer;
+
+[assembly: RegisterFormatter(typeof(NetworkBehaviourFormatter))]
+
+namespace LethalNetworkAPI.Serializable;
+
+
+/// <summary>
+/// Custom formatter for the <see cref="NetworkBehaviour"/> type.
+/// </summary>
+public class NetworkBehaviourFormatter : MinimalBaseFormatter<NetworkBehaviour>
+{
+    private static readonly Serializer<NetworkBehaviourReference> NetworkBehaviourReferenceSerializer = Serializer.Get<NetworkBehaviourReference>();
+    
+    protected override void Read(ref NetworkBehaviour value, IDataReader reader)
+    {
+        value = NetworkBehaviourReferenceSerializer.ReadValue(reader);
+    }
+
+    protected override void Write(ref NetworkBehaviour value, IDataWriter writer)
+    {
+        NetworkBehaviourReferenceSerializer.WriteValue(value, writer);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/LethalNetworkAPI/Serializable/NetworkObjectFormatter.cs b/LethalNetworkAPI/Serializable/NetworkObjectFormatter.cs
new file mode 100644
index 0000000..cb68f26
--- /dev/null
+++ b/LethalNetworkAPI/Serializable/NetworkObjectFormatter.cs
@@ -0,0 +1,47 @@
+using LethalNetworkAPI.Serializable;
+
+#if NETSTANDARD2_1
+using OdinSerializer;
+
+[assembly: RegisterFormatter(typeof(NetworkObjectFormatter))]
+[assembly: RegisterFormatter(typeof(GameObjectFormatter))]
+
+namespace LethalNetworkAPI.Serializable;
+
+/// <summary>
+/// Custom formatter for the <see cref="NetworkObject"/> type.
+/// </summary>
+public class NetworkObjectFormatter : MinimalBaseFormatter<NetworkObject>
+{
+    private static readonly Serializer<NetworkObjectReference> NetworkObjectReferenceSerializer = Serializer.Get<NetworkObjectReference>();
+    
+    protected override void Read(ref NetworkObject value, IDataReader reader)
+    {
+        value = NetworkObjectReferenceSerializer.ReadValue(reader);
+    }
+
+    protected override void Write(ref NetworkObject value, IDataWriter writer)
+    {
+        NetworkObjectReferenceSerializer.WriteValue(value, writer);
+    }
+}
+
+/// <summary>
+/// Custom formatter for the <see cref="GameObject"/> type.
+/// </summary>
+public class GameObjectFormatter : MinimalBaseFormatter<GameObject>
+{
+    private static readonly Serializer<NetworkObjectReference> NetworkObjectReferenceSerializer = Serializer.Get<NetworkObjectReference>();
+    
+    protected override void Read(ref GameObject value, IDataReader reader)
+    {
+        value = NetworkObjectReferenceSerializer.ReadValue(reader);
+    }
+
+    protected override void Write(ref GameObject value, IDataWriter writer)
+    {
+        NetworkObjectReferenceSerializer.WriteValue(value, writer);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/LethalNetworkAPI/Variable/LethalNetworkVariable.cs b/LethalNetworkAPI/Variable/LethalNetworkVariable.cs
index 6d45ef1..03c5272 100644
--- a/LethalNetworkAPI/Variable/LethalNetworkVariable.cs
+++ b/LethalNetworkAPI/Variable/LethalNetworkVariable.cs
@@ -88,12 +88,11 @@ public TData Value
         get => _value;
         set
         {
-            if (!(
-                _public || 
-                (_ownerObject is null && NetworkManager.Singleton.IsServer) || 
-                _ownerObject is null || 
-                _ownerObject.OwnerClientId == NetworkManager.Singleton.LocalClientId
-            )) return;
+            if (!(_public || 
+                  NetworkManager.Singleton == null || 
+                  _ownerObject is null && NetworkManager.Singleton.IsServer || 
+                  _ownerObject is not null && _ownerObject.OwnerClientId == NetworkManager.Singleton.LocalClientId)
+            ) return;
             
             if (value is null) return;