diff --git a/ReallifeGamemode.Client/Gui/taximeter.ts b/ReallifeGamemode.Client/Gui/taximeter.ts index 38c9a06f..f6781170 100644 --- a/ReallifeGamemode.Client/Gui/taximeter.ts +++ b/ReallifeGamemode.Client/Gui/taximeter.ts @@ -68,4 +68,11 @@ export default function taximeterInput(globalData: GlobalData) { browser.destroy(); browser = null; }); + + mp.events.add("CLIENT:resetFareClock", () => { //for Taxidriver + clearInterval(myVar); + browser.execute(`setFarePrice('${price}');`) + }); + + } \ No newline at end of file diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index 04879f7a..cc3b4b14 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -239,7 +239,6 @@ namespace ReallifeGamemode.Server.Managers contractUser.Handmoney -= (int)Math.Round(km * taxiPrice); dbContext.SaveChanges(); contractUser.Player.TriggerEvent("SERVER:SET_HANDMONEY", contractUser.Handmoney); - Console.WriteLine($"{(int)Math.Round(km * taxiPrice)}"); } player.TriggerEvent("CLIENT:startCustomerFare", taxiPrice, km); @@ -270,6 +269,7 @@ namespace ReallifeGamemode.Server.Managers if (driver == null) return; if (player.GetUser().Id != driver.GetData("Passager")) { player.TriggerEvent("CLIENT:cancelFare"); return; } player.TriggerEvent("CLIENT:cancelFareCustomer"); + driver.TriggerEvent("CLIENT:resetFareClock"); driver.ResetData("Passager"); driver.ResetData("hasPassager"); foreach(Player occupant in veh.Occupants)