From ba2f9615724b6c8ff89bc173caec2eb20e44b3f6 Mon Sep 17 00:00:00 2001
From: Eclipses <99494277+EclipsesDev@users.noreply.github.com>
Date: Mon, 15 Apr 2024 15:53:00 +0700
Subject: [PATCH] LEGACY: Fixed NoSlotSet Desync (#2814)

---
 .../utils/inventory/InventoryUtils.kt         | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/inventory/InventoryUtils.kt b/src/main/java/net/ccbluex/liquidbounce/utils/inventory/InventoryUtils.kt
index dba49a7f045..5dda50c7ca1 100644
--- a/src/main/java/net/ccbluex/liquidbounce/utils/inventory/InventoryUtils.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/utils/inventory/InventoryUtils.kt
@@ -8,6 +8,8 @@ package net.ccbluex.liquidbounce.utils.inventory
 import net.ccbluex.liquidbounce.event.*
 import net.ccbluex.liquidbounce.features.module.modules.misc.NoSlotSet
 import net.ccbluex.liquidbounce.features.module.modules.world.ChestAura
+import net.ccbluex.liquidbounce.script.api.global.Chat
+import net.ccbluex.liquidbounce.utils.ClientUtils.LOGGER
 import net.ccbluex.liquidbounce.utils.MinecraftInstance
 import net.ccbluex.liquidbounce.utils.PacketUtils.sendPacket
 import net.ccbluex.liquidbounce.utils.timing.MSTimer
@@ -192,19 +194,26 @@ object InventoryUtils : MinecraftInstance(), Listenable {
 
                     event.cancelEvent()
                 }
-
-                // Prevent desync in minemen server?
-                serverSlot = _serverSlot
             }
         }
     }
 
     @EventTarget
     fun onWorld(event: WorldEvent) {
-        // Prevents desync
-        _serverOpenInventory = false
-        _serverSlot = 0
-        serverOpenContainer = false
+        if (_serverSlot > 0 || _serverOpenInventory || serverOpenContainer) {
+            LOGGER.info("previous slot: $_serverSlot")
+
+            // Prevents desync
+            _serverOpenInventory = false
+            _serverSlot = 0
+            serverOpenContainer = false
+
+            // Prevent desync in minemen server
+            serverSlot = _serverSlot
+            mc.playerController?.currentPlayerItem = serverSlot
+
+            LOGGER.info("reset slot: $serverSlot")
+        }
     }
 
     override fun handleEvents() = true