Skip to content

fix: custom goggles #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
louis1706 wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

fix: custom goggles #768

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c6dd7b
fix: CustomGoggles
louis1706 Feb 25, 2026
1867f9c
fix: retry for customGoggles
louis1706 Mar 7, 2026
bb89a0a
fix: Finally fix and tested
louis1706 Mar 7, 2026
1a8db7a
Merge branch 'dev' into fix-CustomGoggles
louis1706 Mar 7, 2026
09eee00
remove useless code
louis1706 Mar 7, 2026
dc1b8ea
Merge branch 'fix-CustomGoggles' of https://github.com/louis1706/EXIL…
louis1706 Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions EXILED/Exiled.CustomItems/API/Features/CustomGoggles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public override ItemType Type
/// <inheritdoc/>
protected override void SubscribeEvents()
{
InventorySystem.InventoryExtensions.OnInventoryDropped += RemoveSafely;
Exiled.Events.Handlers.Player.UsingItem += OnInternalUsingItem;
Exiled.Events.Handlers.Player.ItemRemoved += OnInternalItemRemoved;
Exiled.Events.Handlers.Scp1344.Deactivating += OnInternalDeactivating;
Expand All @@ -67,6 +68,7 @@ protected override void SubscribeEvents()
/// <inheritdoc/>
protected override void UnsubscribeEvents()
{
InventorySystem.InventoryExtensions.OnInventoryDropped -= RemoveSafely;
Exiled.Events.Handlers.Player.UsingItem -= OnInternalUsingItem;
Exiled.Events.Handlers.Player.ItemRemoved -= OnInternalItemRemoved;
Exiled.Events.Handlers.Scp1344.Deactivating -= OnInternalDeactivating;
Expand Down Expand Up @@ -175,11 +177,11 @@ private void InternalEquip(Player player, Scp1344 goggles)

private void InternalRemove(Player player, Scp1344 goggles)
{
if (!Remove1344Effect)
player.DisableEffect(EffectType.Scp1344);

if (CanBeRemoveSafely)
{
if (!Remove1344Effect)
player.DisableEffect(EffectType.Scp1344);

player.DisableEffect(EffectType.Blindness);
player.ReferenceHub?.DisableWearables(WearableElements.Scp1344Goggles);
}
Expand Down Expand Up @@ -211,5 +213,29 @@ private void OnInternalChangingStatus(ChangingStatusEventArgs ev)

InternalRemove(ev.Player, ev.Scp1344);
}

private void RemoveSafely(ReferenceHub hub)
{
if (!Player.TryGet(hub, out Player owner))
return;

foreach (Item item in owner.Items)
{
if (item.Type != ItemType.SCP1344)
continue;

if (item is not Scp1344 { IsWorn: true } scp1344)
continue;

if (!Check(item))
continue;

if (!CanBeRemoveSafely)
continue;

scp1344.Status = Scp1344Status.Idle;
InternalRemove(owner, scp1344);
}
}
}
}
Loading