CBaseEntity player teleport adjustment update (#661)

Co-authored-by: Michael Wilson <[email protected]>
roflmuffin · Nov 23, 2024 · c6d3988 · c6d3988
1 parent 8a063f4
commit c6d3988
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/managed/CounterStrikeSharp.API/Core/Model/CBaseEntity.cs b/managed/CounterStrikeSharp.API/Core/Model/CBaseEntity.cs
@@ -19,8 +19,14 @@ public void Teleport(Vector? position = null, QAngle? angles = null, Vector? vel
         nint _position = position?.Handle ?? 0;
         nint _angles = angles?.Handle ?? 0;
         nint _velocity = velocity?.Handle ?? 0;
-
-        VirtualFunction.CreateVoid<IntPtr, IntPtr, IntPtr, IntPtr>(Handle, GameData.GetOffset("CBaseEntity_Teleport"))(Handle, _position, _angles, _velocity);
+        nint _handle = Handle;
+
+        if (this is CCSPlayerController player && player.PlayerPawn.Value is CCSPlayerPawn playerPawn)
+        {
+            _handle = playerPawn.Handle;
+        }
+
+        VirtualFunction.CreateVoid<IntPtr, IntPtr, IntPtr, IntPtr>(_handle, GameData.GetOffset("CBaseEntity_Teleport"))(_handle, _position, _angles, _velocity);
     }
 
     /// <exception cref="InvalidOperationException">Entity is not valid</exception>