Done

Closes #15, #13

ReallifeGamemode.Server/Commands/UserCommands.cs

@@ -106,11 +106,7 @@ namespace ReallifeGamemode.Server.Commands
     [Command("hup")]
     public void CmdAnim(Player player)
     {
-      if (player.HasAnimation("hup")) { player.ClearAnimation(); return; }
-      if (player.HasAnimation())
-        return;
-
-      player.SyncAnimation("hup");
+      player.ToggleSurrender();
     }
 
     [Command("event", "~m~Benutzung: ~s~/event [Nachricht]", GreedyArg = true)]

ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs

@@ -15,17 +15,15 @@ namespace ReallifeGamemode.Server.Events
   public class EnterVehicleAttempt : Script
   {
     public static GTANetworkAPI.Vehicle Roller;
+
     [ServerEvent(Event.PlayerEnterVehicleAttempt)]
     public void OnPlayerEnterVehicleAttempt(Player player, GTANetworkAPI.Vehicle vehicle, sbyte seat)
     {
-      if ((VehicleHash)vehicle.Model == VehicleHash.Dune3)
-      {
-        if (seat == 1) seat = 0;
-        else if (seat == 0) seat = 1;
-      }
-
       if (seat != 0) return;
 
+      if (player.HasAnimation())
+        player.StopAnimation();
+
       User u = player.GetUser();
 
       if (vehicle.GetServerVehicle() is FactionVehicle veh)
@@ -84,7 +82,6 @@ namespace ReallifeGamemode.Server.Events
             return;
           }
         }
-
       }
       if (vehicle.GetServerVehicle() is SchoolVehicle sVeh)
       {

ReallifeGamemode.Server/Events/Key.cs

@@ -974,19 +974,7 @@ namespace ReallifeGamemode.Server.Events
     [RemoteEvent("keyPress:ControllH")]
     public void KeyPressControllH(Player player)
     {
-      if (player.HasAnimation("hup"))
-      {
-        PositionManager.cuffPoints.Remove(player);
-        player.ClearAnimation();
-        return;
-      }
-      if (player.HasAnimation())
-        return;
-
-      player.SyncAnimation("hup");
-
-      if (player.GetUser().Wanteds > 0)
-        PositionManager.cuffPoints.Add(player);
+      player.ToggleSurrender();
     }
 
     #endregion User Key

ReallifeGamemode.Server/Extensions/ClientExtension.cs

@@ -344,5 +344,22 @@ namespace ReallifeGamemode.Server.Extensions
         PositionManager.cuffPoints.Remove(nearestCuffPlayer);
       }
     }
+
+    public static void ToggleSurrender(this Player player)
+    {
+      if (player.HasAnimation("hup"))
+      {
+        PositionManager.cuffPoints.Remove(player);
+        player.ClearAnimation();
+        return;
+      }
+      if (player.HasAnimation())
+        return;
+
+      player.SyncAnimation("hup");
+
+      if (player.GetUser().Wanteds > 0)
+        PositionManager.cuffPoints.Add(player);
+    }
   }
 }

ReallifeGamemode.Server/Util/AnimationSync.cs

@@ -13,6 +13,9 @@ namespace ReallifeGamemode.Server.Util
 
     public static void SyncAnimation(this Player player, dynamic animationName)
     {
+      if (player.IsInVehicle)
+        return;
+
       if (!player.HasData("Animation"))
         player.SetData("Animation", String.Empty);
 
@@ -71,6 +74,7 @@ namespace ReallifeGamemode.Server.Util
       if (!player.HasData("Animation"))
         return;
 
+      player.ClearAttachments();
       player.ResetData("Animation");
       player.ResetSharedData("AnimationData");
     }