From 6c02e130b20ddd1875b8dea42cef16bd4d97a4e7 Mon Sep 17 00:00:00 2001
From: Michael <michael.reiswich98@gmail.com>
Date: Mon, 31 Aug 2020 14:41:37 +0200
Subject: [PATCH] some fixes look bugtracker

---
 ReallifeGamemode.Client/Interaction/interactionmenu.ts     | 4 ++--
 ReallifeGamemode.Client/Interaction/worldinteraction.ts    | 6 +++++-
 ReallifeGamemode.Client/assets/css/atm/atm.css             | 3 +++
 .../assets/css/factionmanagement/ranks/style.css           | 3 +++
 ReallifeGamemode.Client/assets/css/inputhelper/style.css   | 1 +
 ReallifeGamemode.Client/assets/css/inventory/style.css     | 3 +++
 ReallifeGamemode.Client/assets/css/licenses/schein.css     | 2 ++
 ReallifeGamemode.Client/assets/css/login/styles.css        | 7 +++++--
 ReallifeGamemode.Client/assets/css/save/blip/style.css     | 3 +++
 ReallifeGamemode.Client/assets/css/taximeter/main.css      | 3 +++
 ReallifeGamemode.Client/assets/css/vehiclemenu/style.css   | 3 +++
 ReallifeGamemode.Client/assets/html/Playerlist/style.css   | 3 +++
 .../assets/html/inventory/css/inventory.css                | 3 +++
 ReallifeGamemode.Client/util/planeschool.ts                | 1 -
 ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs     | 2 +-
 15 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts
index ad754e36..429e3b85 100644
--- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts
+++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts
@@ -325,7 +325,7 @@ export default function (globalData: IGlobalData) {
                 input.show();
                 input.getValue(name => {
                     mp.events.callRemote("CLIENT:InteractionMenu_Invite", "Fraktion", name);
-                    parentMenu.Close();
+                    factionMenu.Close();
                     globalData.InInput = false;
                 });
             } else if (index === 1) { // Uninviten
@@ -334,7 +334,7 @@ export default function (globalData: IGlobalData) {
                 input.show();
                 input.getValue(name => {
                     mp.events.callRemote("CLIENT:InteractionMenu_Uninvite", "Fraktion", name);
-                    parentMenu.Close();
+                    factionMenu.Close();
                     globalData.InInput = false;
                 });
             }
diff --git a/ReallifeGamemode.Client/Interaction/worldinteraction.ts b/ReallifeGamemode.Client/Interaction/worldinteraction.ts
index 9e3fc520..554e453a 100644
--- a/ReallifeGamemode.Client/Interaction/worldinteraction.ts
+++ b/ReallifeGamemode.Client/Interaction/worldinteraction.ts
@@ -1,4 +1,6 @@
-export default function worldInteraction() {
+import { GlobalData } from "..";
+
+export default function worldInteraction() {
     var atmBrowser: BrowserMp;
     var inAtm = false;
 
@@ -10,6 +12,7 @@
             mp.gui.chat.show(false);
             mp.game.ui.displayHud(false);
             mp.game.ui.displayRadar(false);
+            GlobalData.InInput = true;
             atmBrowser = mp.browsers.new("package://assets/html/atm/index.html");
         }        
     });
@@ -20,6 +23,7 @@
         mp.game.ui.displayHud(true);
         mp.game.ui.displayRadar(true);
         inAtm = false;
+        GlobalData.InInput = false;
 
         atmBrowser.destroy();
     });
diff --git a/ReallifeGamemode.Client/assets/css/atm/atm.css b/ReallifeGamemode.Client/assets/css/atm/atm.css
index 1908dc66..e95e49ef 100644
--- a/ReallifeGamemode.Client/assets/css/atm/atm.css
+++ b/ReallifeGamemode.Client/assets/css/atm/atm.css
@@ -16,6 +16,9 @@
             -ms-user-select: none;
                 user-select: none;
     }
+    div {
+    user-select: none;
+    }
 
     .atm {
         background:#6d6d6d;
diff --git a/ReallifeGamemode.Client/assets/css/factionmanagement/ranks/style.css b/ReallifeGamemode.Client/assets/css/factionmanagement/ranks/style.css
index b5d60c39..700f0845 100644
--- a/ReallifeGamemode.Client/assets/css/factionmanagement/ranks/style.css
+++ b/ReallifeGamemode.Client/assets/css/factionmanagement/ranks/style.css
@@ -3,6 +3,9 @@
     -webkit-font-smoothing: antialiased;
     overflow: hidden;
 }
+div {
+    user-select: none;
+}
 
 .table {
     background-color: rgba(255, 255, 255, .8);
diff --git a/ReallifeGamemode.Client/assets/css/inputhelper/style.css b/ReallifeGamemode.Client/assets/css/inputhelper/style.css
index 9076f439..830931f3 100644
--- a/ReallifeGamemode.Client/assets/css/inputhelper/style.css
+++ b/ReallifeGamemode.Client/assets/css/inputhelper/style.css
@@ -1,6 +1,7 @@
 html {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
+    user-select: none;
 }
 
 *, *::before, *::after {
diff --git a/ReallifeGamemode.Client/assets/css/inventory/style.css b/ReallifeGamemode.Client/assets/css/inventory/style.css
index a4f76446..d5dea04c 100644
--- a/ReallifeGamemode.Client/assets/css/inventory/style.css
+++ b/ReallifeGamemode.Client/assets/css/inventory/style.css
@@ -11,6 +11,9 @@
   overflow: hidden;
   overflow-y: scroll;
 }
+div {
+    user-select: none;
+}
 
 #commandOpts li{
   cursor: pointer;
diff --git a/ReallifeGamemode.Client/assets/css/licenses/schein.css b/ReallifeGamemode.Client/assets/css/licenses/schein.css
index 93e544a8..150ee09c 100644
--- a/ReallifeGamemode.Client/assets/css/licenses/schein.css
+++ b/ReallifeGamemode.Client/assets/css/licenses/schein.css
@@ -1,5 +1,7 @@
 html, body {
     overflow: hidden;
+    user-select: none;
+
 }
 #schein {
     overflow: hidden;
diff --git a/ReallifeGamemode.Client/assets/css/login/styles.css b/ReallifeGamemode.Client/assets/css/login/styles.css
index 760b9ecc..f08dfd6d 100644
--- a/ReallifeGamemode.Client/assets/css/login/styles.css
+++ b/ReallifeGamemode.Client/assets/css/login/styles.css
@@ -1,6 +1,8 @@
 html {
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    user-select: none;
+
 }
 
 *, *::before, *::after {
@@ -8,6 +10,7 @@ html {
           box-sizing: inherit;
 }
 
+
 a {
   color: inherit;
   font-weight: bold;
diff --git a/ReallifeGamemode.Client/assets/css/save/blip/style.css b/ReallifeGamemode.Client/assets/css/save/blip/style.css
index e295d68d..1e950a7e 100644
--- a/ReallifeGamemode.Client/assets/css/save/blip/style.css
+++ b/ReallifeGamemode.Client/assets/css/save/blip/style.css
@@ -7,6 +7,9 @@
 .save-page {
     margin: auto;
 }
+div {
+    user-select: none;
+}
 
 .isa_info, .isa_success, .isa_warning, .isa_error {
     margin: 10px 0px;
diff --git a/ReallifeGamemode.Client/assets/css/taximeter/main.css b/ReallifeGamemode.Client/assets/css/taximeter/main.css
index 78269555..bd3efcf8 100644
--- a/ReallifeGamemode.Client/assets/css/taximeter/main.css
+++ b/ReallifeGamemode.Client/assets/css/taximeter/main.css
@@ -12,6 +12,9 @@ body {
     right: 0;
     bottom: 0
 }
+div {
+    user-select: none;
+}
 
 h4 {
     margin: 0
diff --git a/ReallifeGamemode.Client/assets/css/vehiclemenu/style.css b/ReallifeGamemode.Client/assets/css/vehiclemenu/style.css
index 9c48d56c..6d928238 100644
--- a/ReallifeGamemode.Client/assets/css/vehiclemenu/style.css
+++ b/ReallifeGamemode.Client/assets/css/vehiclemenu/style.css
@@ -15,6 +15,9 @@ body {
   font-weight:400;
   line-height:3;
 }
+div {
+    user-select: none;
+}
   
 span.arrow {
     display:none!important;
diff --git a/ReallifeGamemode.Client/assets/html/Playerlist/style.css b/ReallifeGamemode.Client/assets/html/Playerlist/style.css
index bc9e1add..aa5f9d4f 100644
--- a/ReallifeGamemode.Client/assets/html/Playerlist/style.css
+++ b/ReallifeGamemode.Client/assets/html/Playerlist/style.css
@@ -4,6 +4,9 @@
   font-size: 14px;
   width: 250px;
 }
+div {
+    user-select: none;
+}
 
 body {
   overflow: hidden;
diff --git a/ReallifeGamemode.Client/assets/html/inventory/css/inventory.css b/ReallifeGamemode.Client/assets/html/inventory/css/inventory.css
index 29143553..f4c684c0 100644
--- a/ReallifeGamemode.Client/assets/html/inventory/css/inventory.css
+++ b/ReallifeGamemode.Client/assets/html/inventory/css/inventory.css
@@ -14,6 +14,9 @@
     -ms-user-select: none;
     user-select: none;
 }
+div {
+    user-select: none;
+}
 
 body {
     width: 100%;
diff --git a/ReallifeGamemode.Client/util/planeschool.ts b/ReallifeGamemode.Client/util/planeschool.ts
index b564574f..54d5b376 100644
--- a/ReallifeGamemode.Client/util/planeschool.ts
+++ b/ReallifeGamemode.Client/util/planeschool.ts
@@ -28,7 +28,6 @@ export default function planeSchoolHandle(globalData: IGlobalData) {
         mp.game.ui.setTextComponentFormat('STRING');
         mp.game.ui.addTextComponentSubstringPlayerName('Drücke ~INPUT_CONTEXT~, um das Flugschulmenü zu öffnen');
         mp.game.ui.displayHelpTextFromStringLabel(0, true, true, -1);
-
         mp.keys.bind(0x45, false, keyPressHandler);
         keyBound = true;
     });
diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
index c82e5ab0..ff315f55 100644
--- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
+++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
@@ -41,7 +41,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
       {
         //BEGIN
         new Vector3(-745.6191, -1285.735, 3.947221),
-        new Vector3(-704.5242, -1246.765, 8.885977),
+        new Vector3(-704.5242, -1246.765, 9.385977),
         new Vector3(-673.0675, -1266.652, 9.29717),
         new Vector3(-646.1747, -1293.238, 9.28384),
         new Vector3(-510.7098, -916.9164, 24.10735),