Fixed vehicle removal

altmp · Oct 1, 2023 · 2e9d42f · 2e9d42f
1 parent 91cf5dc
commit 2e9d42f
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/freeroam-extended/server/freeroam-extended/Commands.cs b/freeroam-extended/server/freeroam-extended/Commands.cs
@@ -62,6 +62,12 @@ public void SpawnVeh(IAltPlayer player, params string[] args)
                 return;
             }
 
+            if (player.IsInVehicle)
+            {
+                player.SendChatMessage(ChatConstants.ErrorPrefix + "You are already in a vehicle!");
+                return;
+            }
+
             if (player.Vehicles.Count >= 3)
             {
                 var target = player.Vehicles.OrderBy(veh => veh.SpawnTime).First();
@@ -70,13 +76,6 @@ public void SpawnVeh(IAltPlayer player, params string[] args)
                 player.SendChatMessage(ChatConstants.ErrorPrefix + "You can't have more than 3 vehicles. We removed your oldest one!");
             }
 
-            if (player.IsInVehicle)
-            {
-                player.SendChatMessage(ChatConstants.ErrorPrefix + "You are already in a vehicle we replaced it for you!");
-                player.Vehicle.Destroy();
-                return;
-            }
-
             lock (StatsController.StatsData)
             {
                 StatsController.StatsData.VehiclesSpawned++;