diff --git a/Client/Gui/Inventory/inventory.js b/Client/Gui/Inventory/inventory.js index a203fa97..4764460a 100644 --- a/Client/Gui/Inventory/inventory.js +++ b/Client/Gui/Inventory/inventory.js @@ -547,7 +547,7 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world mouseLDown = true; - if (isMouseOverItem(x, y) && dragItem === null) { + if (isMouseOverItem(x, y) && dragItem === null && itemRadial === false) { dragItem = hoverItem; oldDragSlot = items[dragItem][4]; items[dragItem][4] = "-1"; diff --git a/Client/Player/keys.js b/Client/Player/keys.js index 91ec623b..2117917f 100644 --- a/Client/Player/keys.js +++ b/Client/Player/keys.js @@ -9,6 +9,7 @@ var chat = false; var showInventory = false; var showGui = true; +var showInv = false; const player = mp.players.local; @@ -47,6 +48,11 @@ mp.keys.bind(0x45, false, function () { //I //Inventar mp.keys.bind(0x49, false, function () { if (!chat) { + if (showInv === false) { + showInv = true; + } else { + showInv = false; + } mp.events.callRemote("keyPress:I"); } }); @@ -84,7 +90,7 @@ mp.keys.bind(0x4E, false, function () { //T mp.keys.bind(0x54, false, function () { - if (chat === false) { + if (chat === false && showInv === false) { chat = true; } }); diff --git a/Model/DatabaseContext.cs b/Model/DatabaseContext.cs index 2674c8dc..a88eb177 100644 --- a/Model/DatabaseContext.cs +++ b/Model/DatabaseContext.cs @@ -23,7 +23,7 @@ namespace reallife_gamemode.Model protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { base.OnConfiguring(optionsBuilder); - optionsBuilder.UseMySql("Host=localhost;Port=3306;Database=gtav-devdb;Username=gtav-dev;Password=fnweT2QpW9v50v4nX2B6_FllpWI8L1y!l?toFFdDylRsfwHVd8eWDHDY63rmA8Y0gu8K7k8hYx1O76VK"); + optionsBuilder.UseMySql("Host=localhost;Port=3306;Database=gtav-devdb;Username=gtav-dev;Password=Test123"); } protected override void OnModelCreating(ModelBuilder modelBuilder)