From caa0b13c982a9d65b09cfc0da1d91fba3edbe1a1 Mon Sep 17 00:00:00 2001
From: hydrant <log@hydrant.pw>
Date: Sat, 8 May 2021 19:31:38 +0200
Subject: [PATCH 1/2] fix tuning preis anzeige

---
 ReallifeGamemode.Client/Tuning/main.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReallifeGamemode.Client/Tuning/main.ts b/ReallifeGamemode.Client/Tuning/main.ts
index ab46f4a1..eeed93c8 100644
--- a/ReallifeGamemode.Client/Tuning/main.ts
+++ b/ReallifeGamemode.Client/Tuning/main.ts
@@ -205,7 +205,7 @@ export default function tuning(globalData: IGlobalData) {
     });
 
     var currentMod = new Array<number>();
-    var currentActiveModItem = new Array<NativeUI.UIMenuItem>();
+    var currentActiveModItem = new Array<VehicleModMenuItem>();
     var currentSelectedItem: VehicleModMenuItem = null;
 
     mp.events.add("showTuningMenu", (noMoney, basePrice) => {
@@ -373,7 +373,7 @@ export default function tuning(globalData: IGlobalData) {
 
     mp.events.add("SERVER:Tuning_ModSucessfull", (modType: number, index: number) => {
         currentMod[modType] = index - 1;
-        currentActiveModItem[modType].SetRightLabel("$" + moneyformat(currentSelectedItem.price));
+        currentActiveModItem[modType].SetRightLabel("$" + moneyformat(currentActiveModItem[modType].price));
         currentActiveModItem[modType].SetRightBadge(NativeUI.BadgeStyle.None);
         currentSelectedItem.SetRightBadge(BadgeStyle.Car);
         currentSelectedItem.SetRightLabel("");

From 747e7a3916d59ffd9332a05310f71e7eb431c4bf Mon Sep 17 00:00:00 2001
From: hydrant <log@hydrant.pw>
Date: Sat, 8 May 2021 19:39:03 +0200
Subject: [PATCH 2/2] RENTCAR FIX DANKE BALBO

---
 ReallifeGamemode.Server/Events/Key.cs | 71 ++++++++++++++-------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index fead4c44..0f6615b9 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -355,41 +355,6 @@ namespace ReallifeGamemode.Server.Events
           user.SetBlipAndNametagColor();
         }
 
-        //Rentcar Points
-        if (nearestRentcarPoint != null)
-        {
-          if (player.IsInVehicle)
-          {
-            return;
-          }
-
-          //Noobspawn
-          if (player.Position.DistanceTo(PositionManager.rentcarPoints[0].Position) <= 1.5)
-          {
-            player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.noobspawnVehicleProperties), "noobspawn");
-          }
-          //Stadthalle
-          else if (player.Position.DistanceTo(PositionManager.rentcarPoints[1].Position) <= 1.5)
-          {
-            player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.stadthalleVehicleProperties), "lamesa");
-          }
-          //Knast
-          else if (player.Position.DistanceTo(PositionManager.rentcarPoints[2].Position) <= 1.5)
-          {
-            player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.knastVehicleProperties), "stadthalle");
-          }
-          //Paleto
-          else if (player.Position.DistanceTo(PositionManager.rentcarPoints[3].Position) <= 1.5)
-          {
-            player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "knast");
-          }
-          //Lamesa
-          else if (player.Position.DistanceTo(PositionManager.rentcarPoints[4].Position) <= 1.5)
-          {
-            player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "paleto");
-          }
-        }
-
         if (nearestWeapon != null) // Weapon Point
         {
           List<string> primarys = new List<string>();
@@ -528,6 +493,42 @@ namespace ReallifeGamemode.Server.Events
           player.CuffPlayer(nearestCuffPlayer);
         }
       }
+
+      //Rentcar Points
+      if (nearestRentcarPoint != null)
+      {
+        if (player.IsInVehicle)
+        {
+          return;
+        }
+
+        //Noobspawn
+        if (player.Position.DistanceTo(PositionManager.rentcarPoints[0].Position) <= 1.5)
+        {
+          player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.noobspawnVehicleProperties), "noobspawn");
+        }
+        //Stadthalle
+        else if (player.Position.DistanceTo(PositionManager.rentcarPoints[1].Position) <= 1.5)
+        {
+          player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.stadthalleVehicleProperties), "lamesa");
+        }
+        //Knast
+        else if (player.Position.DistanceTo(PositionManager.rentcarPoints[2].Position) <= 1.5)
+        {
+          player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.knastVehicleProperties), "stadthalle");
+        }
+        //Paleto
+        else if (player.Position.DistanceTo(PositionManager.rentcarPoints[3].Position) <= 1.5)
+        {
+          player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "knast");
+        }
+        //Lamesa
+        else if (player.Position.DistanceTo(PositionManager.rentcarPoints[4].Position) <= 1.5)
+        {
+          player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "paleto");
+        }
+      }
+
       if (nearestElevatorPoint != null)
       {
         List<string> stages = new List<string>();