Fixed #29

Author: TavstalDev

TShop/Commands/CommandBuyVehicle.cs

@@ -13,6 +13,7 @@
 using Tavstal.TShop.Components;
 using Tavstal.TShop.Models;
 using Tavstal.TShop.Utils.Helpers;
+using UnityEngine;
 
 namespace Tavstal.TShop.Commands
 {
@@ -95,10 +96,7 @@ protected override async Task<bool> ExecutionRequested(IRocketPlayer caller, str
             await TShop.EconomyProvider.WithdrawAsync(callerPlayer.CSteamID, cost);
             await MainThreadDispatcher.RunOnMainThreadAsync(() =>
             {
-                InteractableVehicle vehicle = VehicleManager.spawnLockedVehicleForPlayerV2(id,
-                    callerPlayer.Position + UnturnedHelper.GetVehicleSpawnModifier(), callerPlayer.Player.transform.rotation,
-                    callerPlayer.Player);
-
+                InteractableVehicle vehicle = UnturnedHelper.SpawnOwnedVehicle(id, callerPlayer);
                 if (!item.VehicleColor.IsNullOrEmpty())
                     vehicle.ServerSetPaintColor(item.GetVehicleColor());
             });

TShop/Utils/Handlers/UnturnedEventHandler.cs

@@ -382,9 +382,7 @@ private static void Event_OnButtonClick(Player player, string button)
                                     await TShop.EconomyProvider.WithdrawAsync(uPlayer.CSteamID, cost);
                                     await MainThreadDispatcher.RunOnMainThreadAsync(() =>
                                     {
-                                        InteractableVehicle vehicle = VehicleManager.spawnLockedVehicleForPlayerV2(prod.Key.UnturnedId,
-                                            uPlayer.Position + UnturnedHelper.GetVehicleSpawnModifier(),
-                                            uPlayer.Player.transform.rotation, uPlayer.Player);
+                                        InteractableVehicle vehicle = UnturnedHelper.SpawnOwnedVehicle(prod.Key.UnturnedId, uPlayer);;
 
                                         if (!prod.Key.VehicleColor.IsNullOrEmpty())
                                             vehicle.ServerSetPaintColor(prod.Key.GetVehicleColor());

TShop/Utils/Helpers/UnturnedHelper.cs

@@ -2,6 +2,8 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Linq;
+using Rocket.Unturned.Player;
+using SDG.Unturned;
 using Tavstal.TShop.Models;
 using UnityEngine;
 
@@ -99,7 +101,7 @@ public static string GetVehiclesInJson()
         /// <exception cref="Exception">
         /// Logs an error if there is an issue retrieving the vehicle spawn modifier.
         /// </exception>
-        public static Vector3 GetVehicleSpawnModifier()
+        private static Vector3 GetVehicleSpawnModifier()
         {
             try
             {
@@ -110,7 +112,23 @@ public static Vector3 GetVehicleSpawnModifier()
                 TShop.Logger.LogError("Failed to get vehicle spawn modifier. Using default value...");
             }
 
-            return new Vector3(0, 5, 0);
+            return new Vector3(0, 5, 5);
+        }
+
+        /// <summary>
+        /// Spawns a vehicle owned by the specified player at the player's current position,
+        /// rotated to match the direction the player is looking.
+        /// </summary>
+        /// <param name="id">The ID of the vehicle to spawn.</param>
+        /// <param name="owner">The player who will own the spawned vehicle.</param>
+        /// <returns>
+        /// The spawned <see cref="InteractableVehicle"/> instance.
+        /// </returns>
+        public static InteractableVehicle SpawnOwnedVehicle(ushort id, UnturnedPlayer owner)
+        {
+            Quaternion playerRotation = Quaternion.LookRotation(owner.Player.look.aim.forward);
+            Vector3 spawnPosition =  owner.Position + (playerRotation * GetVehicleSpawnModifier());
+            return VehicleManager.spawnLockedVehicleForPlayerV2(id, spawnPosition, owner.Player.transform.rotation, owner.Player);
         }
     }
 }