From 8001be2aa21b24c07a8b6bec128e44c19f676ec7 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 15 Jul 2020 16:05:36 +0200 Subject: [PATCH] fix taxifahrer & input freeze --- .../assets/css/taximeter/main.css | 13 +++++++------ ReallifeGamemode.Client/inputhelper/index.ts | 5 ++--- ReallifeGamemode.Server/Job/TaxiDriverJob.cs | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ReallifeGamemode.Client/assets/css/taximeter/main.css b/ReallifeGamemode.Client/assets/css/taximeter/main.css index ab83f6e1..d7f10611 100644 --- a/ReallifeGamemode.Client/assets/css/taximeter/main.css +++ b/ReallifeGamemode.Client/assets/css/taximeter/main.css @@ -6,7 +6,7 @@ } body { - width: 640px + width: 240px } h4 { @@ -16,15 +16,16 @@ h4 { .taximeter-company { background-color: #171717; max-width: 100% + } .taximeter-company__header { text-align: center; padding: 0; margin: 0; - font-size: 170%; + font-size: 100%; font-family: DS-Digital; - color: #ff0 + color: #ff0; } .taximeter { @@ -33,7 +34,7 @@ h4 { padding: 1em; display: flex; justify-content: space-between; - background-color: #171717 + background-color: #171717; } .taximeter-element { @@ -43,7 +44,7 @@ h4 { } .taximeter-header { - font-size: 170%; + font-size: 70%; color: red; font-family: DS-Digital } @@ -53,7 +54,7 @@ h4 { max-width: 100%; margin: 0; font-family: DS-Digital; - font-size: 250%; + font-size: 150%; color: red; display: block } diff --git a/ReallifeGamemode.Client/inputhelper/index.ts b/ReallifeGamemode.Client/inputhelper/index.ts index 8ef6d4b0..08604b06 100644 --- a/ReallifeGamemode.Client/inputhelper/index.ts +++ b/ReallifeGamemode.Client/inputhelper/index.ts @@ -25,9 +25,8 @@ export default class InputHelper { this.value = undefined; const disableInput = [157, 158, 159, 32, 33, 34, 35]; - mp.events.add("render", () => { - mp.game.controls.disableAllControlActions(0); - }); + mp.events.add("render", this.disableControls); + } private disableControls() { diff --git a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs index 57adfdc0..90aab56d 100644 --- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs +++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs @@ -85,8 +85,9 @@ namespace ReallifeGamemode.Server.Job { User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault(); target.Handmoney -= amount; + player.GetUser(dbContext).Wage += amount; dbContext.SaveChanges(); - target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney); + //target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney); } }