diff --git a/Client/Gui/Inventory/inventory.js b/Client/Gui/Inventory/inventory.js index 09423742..f18d39cd 100644 --- a/Client/Gui/Inventory/inventory.js +++ b/Client/Gui/Inventory/inventory.js @@ -61,7 +61,7 @@ mp.events.add("showInventory", (invWeight, itemArr) => { inventoryWeight = invWeight; items = itemArr; show = true; - mp.game.graphics.requestStreamedTextureDict("Mprpsymbol", true); + mp.game.graphics.requestStreamedTextureDict("ItemImages", true); } else { mp.gui.chat.activate(true); mp.gui.cursor.show(false, false); @@ -109,7 +109,7 @@ mp.events.add("render", () => { //SPRITES + ITEMANZAHL for (var currentItem = 0; currentItem < items.length; currentItem++) { if (items[currentItem][4] !== "null") { - mp.game.graphics.drawSprite("Mprpsymbol", "rp", grid[parseInt(items[currentItem][4] - 1)][0], grid[parseInt(items[currentItem][4] - 1)][1], rWidth / 8, rWidth / 5, 0, 255, 255, 255, 255); + mp.game.graphics.drawSprite("ItemImages", items[currentItem][0], grid[parseInt(items[currentItem][4] - 1)][0], grid[parseInt(items[currentItem][4] - 1)][1], rWidth / 8, rWidth / 5, 0, 255, 255, 255, 255); mp.game.graphics.drawText("(~y~" + items[currentItem][3] + "~s~)", [grid[parseInt(items[currentItem][4] - 1)][0] + (sizeMul / 2) - 0.008, grid[parseInt(items[currentItem][4] - 1)][1] + 0.05], { font: 0, color: [255, 255, 255, 255], @@ -143,7 +143,7 @@ mp.events.add("render", () => { }); //EINZELGEWICHT - mp.game.graphics.drawText("~y~" + hoverItemP[2] + "g", [pos[0] / screenX, pos[1] / screenY + 0.06], { + mp.game.graphics.drawText("~y~" + hoverItemP[2] + "g~s~ * " + hoverItemP[3] + "~s~ = ~y~" + hoverItemP[2] * hoverItemP[3] + "g", [pos[0] / screenX, pos[1] / screenY + 0.06], { font: 4, color: [255, 255, 255, 255], scale: [0.35, 0.35], @@ -151,16 +151,6 @@ mp.events.add("render", () => { }); } - ////WENN FREIER SLOT - //if (isMouseOverFreeSlot(pos[0], pos[1])) { - // mp.game.graphics.drawText("~r~FREE SLOT ~g~" + actFreeSlot, [0.5, 0.05], { - // font: 4, - // color: [255, 255, 255, 255], - // scale: [0.7, 0.7], - // outline: true, - // }); - //} - //WENN MOUSE DOWN if (mouseDown && dragItem !== null) { if (isMouseOverFreeSlot(pos[0], pos[1])) { diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs index 9fa1bbf0..11cfb233 100644 --- a/Server/Events/Key.cs +++ b/Server/Events/Key.cs @@ -25,7 +25,8 @@ namespace reallife_gamemode.Server.Events [RemoteEvent("keyPress:NUM2")] public void KeyPressNUM2(Client player) { - if(player.GetData("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true) + if (!player.IsLoggedIn()) return; + if (player.GetData("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true) { TempBlip tempBlip = NAPI.Data.GetWorldData("blipTemplate"); SaveManager.OnSaveBlipData(player, tempBlip.Sprite.ToString(), tempBlip.Name, tempBlip.Scale.ToString(), tempBlip.Color.ToString(), @@ -36,6 +37,7 @@ namespace reallife_gamemode.Server.Events [RemoteEvent("keyPress:E")] public void KeyPressE(Client player) { + if (!player.IsLoggedIn()) return; var user = player.GetUser(); if (user?.FactionId != null) { @@ -100,6 +102,7 @@ namespace reallife_gamemode.Server.Events [RemoteEvent("keyPress:I")] public void KeyPressI(Client player) { + if (!player.IsLoggedIn()) return; List players = NAPI.Pools.GetAllPlayers(); List ListPlayers = new List(); @@ -117,6 +120,7 @@ namespace reallife_gamemode.Server.Events [RemoteEvent("keyPress:J")] public void KeyPressJ(Client player) { + if (!player.IsLoggedIn()) return; var user = player.GetUser(); var inventoryWeight = 0; @@ -143,6 +147,7 @@ namespace reallife_gamemode.Server.Events [RemoteEvent("keyPress:K")] public void KeyPressK(Client player) { + if (!player.IsLoggedIn()) return; var user = player.GetUser(); if (user?.FactionId != null) { @@ -195,11 +200,13 @@ namespace reallife_gamemode.Server.Events [RemoteEvent("keyPress:L")] public void KeyPressL(Client player) { + if (!player.IsLoggedIn()) return; DoorManager.ChangeDoorState(player); } [RemoteEvent("keyPress:N")] public void KeyPressN(Client player) { + if (!player.IsLoggedIn()) return; if (player.IsInVehicle && player.VehicleSeat == -1) { player.Vehicle.EngineStatus = !player.Vehicle.EngineStatus; @@ -208,6 +215,7 @@ namespace reallife_gamemode.Server.Events [RemoteEvent("keyPress:X")] public void KeyPressX(Client player) { + if (!player.IsLoggedIn()) return; if (player.IsInVehicle) { player.Seatbelt = !player.Seatbelt;