Skip to content

fix: PlayerReceivingLoadoutEventArgs from LabAPI #773

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
TiBarification wants to merge 5 commits into
base: dev
Choose a base branch
from
+15 −2
Open

fix: PlayerReceivingLoadoutEventArgs from LabAPI #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4d7877
added trigger events of labapi loadout
TiBarification Mar 8, 2026
1cfea1e
fix: moved OnReceivedLoadout event from loop
TiBarification Mar 8, 2026
1aa589d
fix: PlayerReceivingLoadoutEventArgs not having ev.Item/ev.Ammo working
louis1706 Mar 9, 2026
91231da
Apply suggestion from @louis1706
louis1706 Mar 12, 2026
ac5e5d5
Update ChangingRoleEventArgs.cs
Someone-193 Mar 28, 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
14 changes: 12 additions & 2 deletions EXILED/Exiled.Events/EventArgs/Player/ChangingRoleEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
namespace Exiled.Events.EventArgs.Player
{
using System.Collections.Generic;
using System.Linq;

using API.Enums;
using API.Features;
using Exiled.API.Extensions;
using Exiled.API.Features.Pools;
using Interfaces;
using InventorySystem;
using LabApi.Events.Arguments.PlayerEvents;
using LabApi.Events.Handlers;
using PlayerRoles;

/// <summary>
Expand Down Expand Up @@ -72,10 +75,17 @@ public RoleTypeId NewRole
Items.Clear();
Ammo.Clear();

foreach (ItemType itemType in inventory.Items)
PlayerReceivingLoadoutEventArgs playerReceivingLoadoutEventArgs = new(Player.ReferenceHub, inventory.Items.ToList(), inventory.Ammo, !ShouldPreserveInventory);
PlayerEvents.OnReceivingLoadout(playerReceivingLoadoutEventArgs);
if (!playerReceivingLoadoutEventArgs.IsAllowed)
{
return;
}

foreach (ItemType itemType in playerReceivingLoadoutEventArgs.Items)
Items.Add(itemType);

foreach (KeyValuePair<ItemType, ushort> ammoPair in inventory.Ammo)
foreach (KeyValuePair<ItemType, ushort> ammoPair in playerReceivingLoadoutEventArgs.Ammo)
Ammo.Add(ammoPair.Key, ammoPair.Value);

field = value;
Expand Down
3 changes: 3 additions & 0 deletions EXILED/Exiled.Events/Patches/Events/Player/ChangingRoleAndSpawned.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ namespace Exiled.Events.Patches.Events.Player
using InventorySystem.Items.Armor;
using InventorySystem.Items.Pickups;
using InventorySystem.Items.Usables.Scp1344;
using LabApi.Events.Arguments.PlayerEvents;
using LabApi.Events.Handlers;
using Mirror;

using PlayerRoles;
Expand Down Expand Up @@ -230,6 +232,7 @@ private static void ChangeInventory(ChangingRoleEventArgs ev)
InventoryItemProvider.OnItemProvided?.Invoke(ev.Player.ReferenceHub, itemBase);
}

PlayerEvents.OnReceivedLoadout(new PlayerReceivedLoadoutEventArgs(ev.Player.ReferenceHub, ev.Items, ev.Ammo, !ev.ShouldPreserveInventory));
InventoryItemProvider.InventoriesToReplenish.Enqueue(ev.Player.ReferenceHub);
}
catch (Exception exception)
Expand Down
Loading