diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 17bcdb22..3aba410d 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -198,11 +198,6 @@ namespace ReallifeGamemode.Server.Events //ChatService.SendMessage(player, "Debug7"); player.ResetData("PilotenBase"); job.StopJob(player); - if(player.HasData("Passager")) - { - player.TriggerEvent("CLIENT:stopFare"); - player.WarpOutOfVehicle(); - } ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); if (player.GetData("HatRoute") == true) { diff --git a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs index 76bea23c..989656a7 100644 --- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs +++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs @@ -87,22 +87,12 @@ namespace ReallifeGamemode.Server.Job if (player.HasData("hasPassager")) { User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault(); - if(target.Handmoney <= 0) - { - player.SetData("hasPassager", false); player.SendNotification("~r~[Info] ~w~ Dein Kunde hat kein Geld mehr auf der Hand."); - if(player.HasData("Passager")) - { - player.SendNotification("~r~[Info] ~w~ Du hast kein Geld mehr auf der Hand."); - player.TriggerEvent("CLIENT:stopFare"); - player.WarpOutOfVehicle(); - } - } - else { + target.Handmoney -= amount; player.GetUser(dbContext).Wage += amount; dbContext.SaveChanges(); - } + //target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney); } }