Skip to content
This repository was archived by the owner on Jul 8, 2025. It is now read-only.

fix: LabAPI Event not being trigger when tesla event was used #30

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

fix: LabAPI Event not being trigger when tesla event was used #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
257ae3d
Fix For LabAPI
louis1706 May 19, 2025
6bd5393
Merge branch 'dev' into TriggeringTesla-Fix-ForLabAPI
louis1706 May 20, 2025
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
49 changes: 35 additions & 14 deletions EXILED/Exiled.Events/Patches/Events/Player/TriggeringTesla.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
// isTriggerable
new CodeInstruction(OpCodes.Ldloca_S, 3),

// TriggeringTesla.TriggeringTeslaEvent(BaseTeslaGate baseTeslaGate, ref bool inIdleRange, ref bool isTriggerable)
new CodeInstruction(OpCodes.Call, Method(typeof(TriggeringTesla), nameof(TriggeringTeslaEvent), new[] { typeof(BaseTeslaGate), typeof(bool).MakeByRefType(), typeof(bool).MakeByRefType() })),
// stupid1
new CodeInstruction(OpCodes.Ldloca_S, 4),

// stupid2
new CodeInstruction(OpCodes.Ldloca_S, 5),

// TriggeringTesla.TriggeringTeslaEvent(BaseTeslaGate baseTeslaGate, ref bool inIdleRange, ref bool isTriggerable, ref ReferenceHub stupid1, ref ReferenceHub stupid2)
new CodeInstruction(OpCodes.Call, Method(typeof(TriggeringTesla), nameof(TriggeringTeslaEvent))),
});

for (int z = 0; z < newInstructions.Count; z++)
Expand All @@ -65,17 +71,16 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
ListPool<CodeInstruction>.Pool.Return(newInstructions);
}

private static void TriggeringTeslaEvent(BaseTeslaGate baseTeslaGate, ref bool inIdleRange, ref bool isTriggerable)
private static void TriggeringTeslaEvent(BaseTeslaGate baseTeslaGate, ref bool inIdleRange, ref bool isTriggerable, ref ReferenceHub stupid1, ref ReferenceHub stupid2)
{
TeslaGate teslaGate = TeslaGate.Get(baseTeslaGate);
TeslaGate customTesla = TeslaGate.Get(baseTeslaGate);

foreach (Player player in ReferenceHub.AllHubs.Select(Player.Get))
{
if (player is null || !teslaGate.CanBeIdle(player))
if (player is null || !customTesla.CanBeIdle(player))
continue;

TriggeringTeslaEventArgs ev = new(player, teslaGate);

TriggeringTeslaEventArgs ev = new(player, customTesla);
Handlers.Player.OnTriggeringTesla(ev);

if (ev.DisableTesla)
Expand All @@ -85,14 +90,30 @@ private static void TriggeringTeslaEvent(BaseTeslaGate baseTeslaGate, ref bool i
break;
}

if (!ev.IsAllowed)
continue;

if (ev.IsTriggerable && !isTriggerable)
isTriggerable = ev.IsTriggerable;
if (!inIdleRange)
{
if (ev.IsInIdleRange)
{
LabApi.Events.Arguments.PlayerEvents.PlayerIdlingTeslaEventArgs playerIdlingTeslaEventArgs = new(player.ReferenceHub, baseTeslaGate);
LabApi.Events.Handlers.PlayerEvents.OnIdlingTesla(playerIdlingTeslaEventArgs);
if (playerIdlingTeslaEventArgs.IsAllowed)
{
inIdleRange = true;
stupid1 = ev.Player.ReferenceHub;
}
}
}

if (ev.IsInIdleRange && !inIdleRange)
inIdleRange = ev.IsInIdleRange;
if (!isTriggerable && ev.IsTriggerable && !customTesla.IsShocking)
{
LabApi.Events.Arguments.PlayerEvents.PlayerTriggeringTeslaEventArgs playerTriggeringTeslaEventArgs = new(player.ReferenceHub, baseTeslaGate);
LabApi.Events.Handlers.PlayerEvents.OnTriggeringTesla(playerTriggeringTeslaEventArgs);
if (playerTriggeringTeslaEventArgs.IsAllowed)
{
stupid2 = ev.Player.ReferenceHub;
isTriggerable = true;
}
}
}
}
}
Expand Down