From 3c6dd7bde9fbaadec7a0b14a492829461da0bff1 Mon Sep 17 00:00:00 2001
From: Yamato <66829532+louis1706@users.noreply.github.com>
Date: Wed, 25 Feb 2026 22:17:00 +0100
Subject: [PATCH] fix: CustomGoggles

---
 .../API/Features/CustomGoggles.cs                   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomGoggles.cs b/EXILED/Exiled.CustomItems/API/Features/CustomGoggles.cs
index ca4fbdd32..8f73bca3f 100644
--- a/EXILED/Exiled.CustomItems/API/Features/CustomGoggles.cs
+++ b/EXILED/Exiled.CustomItems/API/Features/CustomGoggles.cs
@@ -87,6 +87,14 @@ protected override void OnOwnerChangingRole(OwnerChangingRoleEventArgs ev)
             InternalRemove(ev.Player, scp1344);
         }
 
+        /// <inheritdoc/>
+        protected override void OnAcquired(Player player, Item item, bool displayMessage)
+        {
+            if (CanBeRemoveSafely)
+                InventorySystem.InventoryExtensions.OnInventoryDropped -= ((Scp1344)item).Base.OnPlayerInventoryDropped;
+            base.OnAcquired(player, item, displayMessage);
+        }
+
         /// <summary>
         /// Called when the player equips the goggles.
         /// </summary>
@@ -175,12 +183,9 @@ private void InternalEquip(Player player, Scp1344 goggles)
 
         private void InternalRemove(Player player, Scp1344 goggles)
         {
-            if (!Remove1344Effect)
-                player.DisableEffect(EffectType.Scp1344);
-
             if (CanBeRemoveSafely)
             {
-                player.DisableEffect(EffectType.Blindness);
+                player.DisableEffect(EffectType.Scp1344);
                 player.ReferenceHub?.DisableWearables(WearableElements.Scp1344Goggles);
             }