diff --git a/Server/Events/EnterVehicleAttempt.cs b/Server/Events/EnterVehicleAttempt.cs
index e4c4edee..aceeb9e3 100644
--- a/Server/Events/EnterVehicleAttempt.cs
+++ b/Server/Events/EnterVehicleAttempt.cs
@@ -13,13 +13,16 @@ namespace reallife_gamemode.Server.Events
         [ServerEvent(Event.PlayerEnterVehicleAttempt)]
         public void OnPlayerEnterVehicleAttempt(Client player, Vehicle vehicle, sbyte seat)
         {
-            if (vehicle.HasData("factionId"))
+            if (seat != 0)
             {
-                if((vehicle.GetData("factionId") != player.GetUser().FactionId) && seat == 0)
+                return;
+            }
+
+            if (vehicle.GetServerVehicle() is FactionVehicle veh)
+            {
+                if(veh.FactionId != player.GetUser().FactionId)
                 {
-                    //TODO REWORK
-                    player.SetIntoVehicle(vehicle, 1);
-                    player.WarpOutOfVehicle();
+                    player.StopAnimation();
                     player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true);
                     return;
                 }