Skip to content

fix: Custom Goggles not call OnRemovedGoggles when player dies #794

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

Merged
louis1706 merged 1 commit into from
Mar 30, 2026
Merged

fix: Custom Goggles not call OnRemovedGoggles when player dies #794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 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 @@ -8,6 +8,7 @@
namespace Exiled.CustomItems.API.Features
{
using EventArgs;

using Exiled.API.Enums;
using Exiled.API.Features;
using Exiled.API.Features.Items;
Expand All @@ -18,6 +19,8 @@ namespace Exiled.CustomItems.API.Features

using PlayerRoles.FirstPersonControl.Thirdperson.Subcontrollers.Wearables;

using PlayerStatsSystem;

/// <summary>
/// The Custom Goggles base class.
/// </summary>
Expand Down Expand Up @@ -56,6 +59,7 @@ public override ItemType Type
/// <inheritdoc/>
protected override void SubscribeEvents()
{
PlayerStats.OnAnyPlayerDied += OnOwnerDied;
InventorySystem.InventoryExtensions.OnInventoryDropped += RemoveSafely;
Exiled.Events.Handlers.Player.UsingItem += OnInternalUsingItem;
Exiled.Events.Handlers.Player.ItemRemoved += OnInternalItemRemoved;
Expand All @@ -68,6 +72,7 @@ protected override void SubscribeEvents()
/// <inheritdoc/>
protected override void UnsubscribeEvents()
{
PlayerStats.OnAnyPlayerDied -= OnOwnerDied;
InventorySystem.InventoryExtensions.OnInventoryDropped -= RemoveSafely;
Exiled.Events.Handlers.Player.UsingItem -= OnInternalUsingItem;
Exiled.Events.Handlers.Player.ItemRemoved -= OnInternalItemRemoved;
Expand Down Expand Up @@ -214,6 +219,8 @@ private void OnInternalChangingStatus(ChangingStatusEventArgs ev)
InternalRemove(ev.Player, ev.Scp1344);
}

private void OnOwnerDied(ReferenceHub hub, DamageHandlerBase handler) => RemoveSafely(hub);

private void RemoveSafely(ReferenceHub hub)
{
if (!Player.TryGet(hub, out Player owner))
Expand Down
Loading