From e0d229e7d256bdf6220ff3a91e240a7657ff461c Mon Sep 17 00:00:00 2001
From: "michael.reiswich" <michael.reiswich@stud.hn.de>
Date: Wed, 20 Jan 2021 00:55:13 +0100
Subject: [PATCH] fix wt entlade checkpoint & add waypoints for base

---
 .../Events/EnterVehicle.cs                    | 10 ++++
 ReallifeGamemode.Server/Events/ExitVehicle.cs |  1 -
 .../Factions/BasePoints.cs                    | 57 +++++++++++++++++++
 .../WeaponDeal/WeaponDealManager.cs           |  4 +-
 4 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 ReallifeGamemode.Server/Factions/BasePoints.cs

diff --git a/ReallifeGamemode.Server/Events/EnterVehicle.cs b/ReallifeGamemode.Server/Events/EnterVehicle.cs
index 1d609082..e6bce887 100644
--- a/ReallifeGamemode.Server/Events/EnterVehicle.cs
+++ b/ReallifeGamemode.Server/Events/EnterVehicle.cs
@@ -34,6 +34,16 @@ namespace ReallifeGamemode.Server.Events
           dealPoint.Add(vehicle.GetData<Vector3>("weaponDealPoint"));
           CheckPointHandle.StartCheckPointRoute(client, dealPoint, 5000, 1, 7, 3, true, "loadWeaponTransport");
         }
+        else if ((u.FactionId != null)
+                && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3 || (VehicleHash)vehicle.Model == VehicleHash.Policet)
+                && vehicle.HasData("WeaponDealLoad")
+                && vehicle.GetData<bool>("WeaponDealLoad") == true)
+        {
+          BasePoints basePoints = new BasePoints();
+          basePoints.getbase(u.FactionId, client);        
+        }
+
+
       }
     }
   }
diff --git a/ReallifeGamemode.Server/Events/ExitVehicle.cs b/ReallifeGamemode.Server/Events/ExitVehicle.cs
index aae975c7..12bc6306 100644
--- a/ReallifeGamemode.Server/Events/ExitVehicle.cs
+++ b/ReallifeGamemode.Server/Events/ExitVehicle.cs
@@ -35,7 +35,6 @@ namespace ReallifeGamemode.Server.Events
           client.TriggerEvent("destroyCP");
         }
         else if ((u.FactionId != null)
-                 && (veh.GetOwners().Contains(u.FactionId ?? 0))
                  && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3 || (VehicleHash)vehicle.Model == VehicleHash.Policet)
                  && vehicle.HasData("WeaponDealLoad")
                  && vehicle.GetData<bool>("WeaponDealLoad") == true)
diff --git a/ReallifeGamemode.Server/Factions/BasePoints.cs b/ReallifeGamemode.Server/Factions/BasePoints.cs
new file mode 100644
index 00000000..bff3a90d
--- /dev/null
+++ b/ReallifeGamemode.Server/Factions/BasePoints.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using GTANetworkAPI;
+using ReallifeGamemode.Database.Entities;
+using ReallifeGamemode.Server.Extensions;
+using ReallifeGamemode.Server.Util;
+
+
+namespace ReallifeGamemode.Server.WeaponDeal
+{
+  class BasePoints
+  {
+    
+    public void getbase(int? factionID, Player client)
+    {
+      
+      if (factionID == 1)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", 428.07, -977.88); // LSPD
+      }
+      else if( factionID == 2)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", 1157.56, -1518.56); // Sanitäter
+      }
+      else if (factionID == 3)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", 88.10, -741.76); // FIB
+      }
+      else if (factionID == 4)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", -394.30, -2785.44); // Trucker
+      }
+      else if (factionID == 5)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", 1157.56, -1518.56); // Terror
+      }
+      else if (factionID == 6)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", 1157.56, -1518.56); // Hitmen
+      }
+      else if (factionID == 7)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", 103.72, -1939.43); // Grove
+      }
+      else if (factionID == 8)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", 1209.42, -1628.65); // Ballas
+      }
+      else if (factionID == 9)
+      {
+        client.TriggerEvent("SERVER:Util_setWaypoint", -604.04, -930.92); // News Reporter
+      }
+
+    }
+  }
+}
diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
index a666782d..737b70ad 100644
--- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
+++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using GTANetworkAPI;
@@ -232,6 +232,8 @@ namespace ReallifeGamemode.Server.WeaponDeal
 
         ChatService.BroadcastFaction("~y~[WAFFENDEAL] ~w~Der Transporter wurde erfolgreich beladen.", new List<int>() { client.GetUser().Faction.Id });
         client.SendChatMessage("~y~[WAFFENDEAL] ~w~Fahre nun zu deiner Base zurück.");
+        BasePoints basePoints = new BasePoints();
+        basePoints.getbase(user.FactionId, client);
       }
     }
   }