Make NetworkedVector support Vector and QAngle (#728)

roflmuffin · Jan 8, 2025 · bd1105d · bd1105d
1 parent 9b4ee72
commit bd1105d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/managed/CounterStrikeSharp.API/Core/Model/NetworkedVector.cs b/managed/CounterStrikeSharp.API/Core/Model/NetworkedVector.cs
@@ -12,8 +12,12 @@ namespace CounterStrikeSharp.API.Core;
 
 public partial class NetworkedVector<T> : NativeObject, IReadOnlyCollection<T>
 {
+    private readonly bool IsValidType;
+
     public NetworkedVector(IntPtr pointer) : base(pointer)
     {
+        Type t = typeof(T);
+        IsValidType = (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(CHandle<>)) || t == typeof(Vector) || t == typeof(QAngle);
     }
 
     public unsafe uint Size => Unsafe.Read<uint>((void*)Handle);
@@ -24,11 +28,11 @@ public T this[int index]
     {
         get
         {
-            if (!typeof(T).IsGenericType || typeof(T).GetGenericTypeDefinition() != typeof(CHandle<>))
+            if (IsValidType)
             {
-                throw new NotSupportedException("Networked vectors currently only support CHandle<T>");
+                throw new NotSupportedException("Networked vectors currently only support CHandle<T>, Vector, or QAngle");
             }
-            
+
             return (T)Activator.CreateInstance(typeof(T), NativeAPI.GetNetworkVectorElementAt(Handle, index));
         }
     }
@@ -50,4 +54,4 @@ IEnumerator IEnumerable.GetEnumerator()
     {
         return GetEnumerator();
     }
-}
+}
diff --git a/src/scripting/natives/natives_memory.cpp b/src/scripting/natives/natives_memory.cpp
@@ -140,15 +140,15 @@ int GetNetworkVectorSize(ScriptContext& script_context)
 
 void* GetNetworkVectorElementAt(ScriptContext& script_context)
 {
-    auto vec = script_context.GetArgument<CUtlVector<CEntityHandle>*>(0);
+    auto vec = script_context.GetArgument<CUtlVector<void*>*>(0);
     auto index = script_context.GetArgument<int>(1);
 
     return &vec->Element(index);
 }
 
 void RemoveAllNetworkVectorElements(ScriptContext& script_context)
 {
-    auto vec = script_context.GetArgument<CUtlVector<CEntityHandle>*>(0);
+    auto vec = script_context.GetArgument<CUtlVector<void*>*>(0);
 
     vec->RemoveAll();
 }