diff --git a/ReallifeGamemode.Client/util/carwash.ts b/ReallifeGamemode.Client/util/carwash.ts index 600ca0ad..914a2696 100644 --- a/ReallifeGamemode.Client/util/carwash.ts +++ b/ReallifeGamemode.Client/util/carwash.ts @@ -7,10 +7,18 @@ }); mp.events.add('entityStreamIn', (entity) => { - if (entity.type !== 'vehicle' || !entity.hasVariable('dirtLevel')) { + if (entity.type !== 'vehicle') { return; } - const dirtLevel = entity.getVariable('dirtLevel') || 0; - entity.setDirtLevel(parseFloat(dirtLevel)); + const dirtLevel = entity.vehicle.getDirtLevel(); + entity.setDirtLevel(dirtLevel); + }); + + mp.events.add('getdirtlevel', () => { + let vehicle = mp.players.local.vehicle; + + let num = vehicle.getDirtLevel(); + + mp.gui.chat.push("Dirtlevel = " + num); }); } \ No newline at end of file diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index d2a3d842..fffaa442 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -4024,13 +4024,18 @@ namespace ReallifeGamemode.Server.Commands ChatService.BroadcastAdmin("~b~[ADMIN]~s~ " + player.Name + " hat " + target.Name + " den Blackscreen entfernt. ", AdminLevel.ADMIN); } } - [Command("washcar", "~m~Benutzung: ~s~/washcar")] public void washcar(Player player) { player.TriggerEvent("washcar"); } + [Command("getdirtlevel", "~m~Benutzung: ~s~/getdirtlevel")] + public void dirtlevel(Player player) + { + player.TriggerEvent("getdirtlevel"); + } + [Command("makeadmin", "~m~Benutzung: ~s~/makeadmin [Name] [Adminlevel]")] public void CmdAdminMakeadmin(Player player, string name, int rank) { diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index bd7f824a..3725a372 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -378,16 +378,24 @@ namespace ReallifeGamemode.Server.Managers colShape.OnEntityEnterColShape += (cs, c) => { - if (!c.IsInVehicle) return; + if (!(c.IsInVehicle && c.VehicleSeat == 0)) return; - c.TriggerEvent("washcar"); + using (var dbcontext = new DatabaseContext()) { User u = c.GetUser(dbcontext); - u.BankAccount.Balance -= 100; - dbcontext.SaveChanges(); + if(u.Handmoney <= 0) + { + c.SendNotification("Du hast nicht genug Geld auf der Hand!"); + return; + } + else { + c.TriggerEvent("washcar"); + c.SendNotification("Die Autowäsche hat dich ~g~$~w~100 gekostet."); + u.Handmoney -= 100; + dbcontext.SaveChanges(); + } } - c.SendNotification("Die Autowäsche hat dich ~g~$~w~100 gekostet."); }; }