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); } + /// + protected override void OnAcquired(Player player, Item item, bool displayMessage) + { + if (CanBeRemoveSafely) + InventorySystem.InventoryExtensions.OnInventoryDropped -= ((Scp1344)item).Base.OnPlayerInventoryDropped; + base.OnAcquired(player, item, displayMessage); + } + /// /// Called when the player equips the goggles. /// @@ -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); }