From d8174866023c1dc8bee1955a9952a223e025707c Mon Sep 17 00:00:00 2001
From: hydrant <lennart@kampshoff.xyz>
Date: Sat, 20 Jul 2019 13:54:29 +0200
Subject: [PATCH] Fix dutycloth

---
 ReallifeGamemode.Client/Player/dutycloth.ts | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/ReallifeGamemode.Client/Player/dutycloth.ts b/ReallifeGamemode.Client/Player/dutycloth.ts
index 32b12201..258794b0 100644
--- a/ReallifeGamemode.Client/Player/dutycloth.ts
+++ b/ReallifeGamemode.Client/Player/dutycloth.ts
@@ -26,7 +26,7 @@ cancelItem.HighlightedBackColor = new Color(229, 57, 53);
 
 export default function dutyCloth(globalData: GlobalData) {
 
-    var dutyMenu;
+    var dutyMenu: NativeUI.Menu;
 
     var hats;
     var tops;
@@ -34,9 +34,9 @@ export default function dutyCloth(globalData: GlobalData) {
     var shoes;
 
     var hat = -1;
-    var top;
-    var leg;
-    var shoe;
+    var top = 0;
+    var leg = 0;
+    var shoe = 0;
 
     //Cloth Menu
 
@@ -45,14 +45,13 @@ export default function dutyCloth(globalData: GlobalData) {
 
             globalData.InMenu = true;
 
-            mp.gui.chat.activate(false);
             hats = hatsArr;
             tops = topsArr;
             legs = legsArr;
             shoes = shoesArr;
 
-            dutyMenu = new Menu("Dienstkleidung", "Stelle deine Dienstkleidung zusammen", new Point(0, screenRes.y / 2), null, null);
-                                                                                    
+            dutyMenu = new Menu("Dienstkleidung", "Stelle deine Dienstkleidung zusammen", new Point(50, 50), null, null);
+
             dutyMenu.AddItem(new UIMenuListItem("Hut", "", new ItemsCollection(hats)));
             dutyMenu.AddItem(new UIMenuListItem("Top", "", new ItemsCollection(tops)));
             dutyMenu.AddItem(new UIMenuListItem("Hose", "", new ItemsCollection(legs)));
@@ -66,11 +65,10 @@ export default function dutyCloth(globalData: GlobalData) {
                     case "Hut":
                         if (item.SelectedItem.DisplayText === "Keinen") {
                             hat = -1;
-                            mp.events.callRemote("updateDutyProp", 0, -1);
                         } else {
                             hat = parseInt(item.SelectedItem.DisplayText);
-                            mp.events.callRemote("updateDutyProp", 0, hat);
                         }
+                        mp.events.callRemote("updateDutyProp", 0, hat);
                         break;
                     case "Top":
                         top = parseInt(item.SelectedItem.DisplayText);
@@ -93,11 +91,10 @@ export default function dutyCloth(globalData: GlobalData) {
                     var slotId = [0, 11, 4, 6];
                     var clothId = [hat, top, leg, shoe];
                     mp.events.callRemote("saveCharacterCloth", JSON.stringify(slotType), JSON.stringify(slotId), JSON.stringify(clothId));
-                    dutyMenu.Visible = false;
-                    mp.gui.chat.activate(true);
+                    dutyMenu.Close();
+                    globalData.InMenu = false;
                 } else if (item.Text === "Abbrechen") {
-                    dutyMenu.Visible = false;
-                    mp.gui.chat.activate(true);
+                    dutyMenu.Close();
                     mp.events.callRemote("defaultCharacterCloth");
                     globalData.InMenu = false;
                 }
@@ -105,8 +102,6 @@ export default function dutyCloth(globalData: GlobalData) {
 
 
             dutyMenu.MenuClose.on(() => {
-                dutyMenu.Visible = false;
-                mp.gui.chat.activate(true);
                 mp.events.callRemote("defaultCharacterCloth");
                 globalData.InMenu = false;
             });