diff --git a/ReallifeGamemode.Client/Gui/playerlist.ts b/ReallifeGamemode.Client/Gui/playerlist.ts index 454b0df0..aabc8714 100644 --- a/ReallifeGamemode.Client/Gui/playerlist.ts +++ b/ReallifeGamemode.Client/Gui/playerlist.ts @@ -15,11 +15,13 @@ export default function playerList(globalData: IGlobalData): void { playerlistBrowser.destroy(); playerlistBrowser = null; globalData.InInput = false; + globalData.InMenu = false; mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); } - else if (!globalData.InInput) { + else if (!globalData.InMenu) { globalData.InInput = true; + globalData.InMenu = true; playerlistBrowser = mp.browsers.new('package://assets/html/Playerlist/Tabliste.html'); mp.gui.chat.activate(false); mp.gui.cursor.show(true, true); diff --git a/ReallifeGamemode.Client/inventory/inventory.ts b/ReallifeGamemode.Client/inventory/inventory.ts index 5b47fcb2..af7b28d7 100644 --- a/ReallifeGamemode.Client/inventory/inventory.ts +++ b/ReallifeGamemode.Client/inventory/inventory.ts @@ -16,12 +16,14 @@ invBrowser.destroy() invBrowser = null; globalData.InInput = false; + globalData.InMenu = false; loaded = false; mp.gui.cursor.show(false, false); return; } - if (!globalData.InInput) { + if (!globalData.InMenu) { globalData.InInput = true; + globalData.InMenu = true; mp.gui.cursor.show(true, true); itemArr = []; vehItemArr = []; @@ -37,6 +39,7 @@ mp.events.add('openInventory', () => { globalData.InInput = true; + globalData.InMenu = true; mp.gui.cursor.show(true, true); itemArr = []; vehItemArr = []; @@ -46,6 +49,7 @@ invBrowser.destroy() invBrowser = null; globalData.InInput = false; + globalData.InMenu = false; loaded = false; mp.gui.cursor.show(false, false); return; diff --git a/ReallifeGamemode.Client/util/attachmentMngr.ts b/ReallifeGamemode.Client/util/attachmentMngr.ts index 60ba0235..1cc1579f 100644 --- a/ReallifeGamemode.Client/util/attachmentMngr.ts +++ b/ReallifeGamemode.Client/util/attachmentMngr.ts @@ -32,13 +32,7 @@ export default function attachmentManager(game: IGame) { } else if (entityRage.type === "vehicle") { var vehicle = game.vehicles.at(entityRage.remoteId); entity = vehicle; - var realName = mp.game.ui.getLabelText(mp.game.vehicle.getDisplayNameFromVehicleModel(entityRage.model)); - } else if (entityRage.type === "object") { - return; - } - - - + } let e = game.attachments.get(entity); @@ -65,7 +59,7 @@ export default function attachmentManager(game: IGame) { rotation: attInfo.rotation }; - game.objects.setData(rageObject, attachmentData); // hier hakt es mein freund + game.objects.setData(rageObject, attachmentData); let object = game.objects.at(rageObject.remoteId); @@ -264,7 +258,6 @@ export default function attachmentManager(game: IGame) { if (e != null) { if (e.__attachmentObjects) { - //game.wait(2500); attachmentMngr.shutdownFor(entityRage); } }