Skip to content
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.

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

Fixing Scp1507.AttackingDoor Patch #348

Merged
merged 30 commits into from
Dec 26, 2024
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
24d6fb5
Scp 559 events (#2345)
VALERA771 Dec 28, 2023
429d7e7
SCP-3114 ragdoll (#2368)
VALERA771 Dec 30, 2023
3b82358
Coffee API (#2360)
VALERA771 Jan 13, 2024
c15031e
Flamingo respawn event (#2362)
VALERA771 Dec 28, 2023
6ab45c1
SpawnReason::ItemUsage
louis1706 Dec 24, 2023
ec08926
Move File to the new place
louis1706 Dec 23, 2024
3699974
Lots of new API (#2342)
VALERA771 Dec 22, 2023
25fb4ea
revert
louis1706 Dec 23, 2024
f8f68a7
push
louis1706 Dec 23, 2024
60103fc
Finish Fix build
louis1706 Dec 23, 2024
090b2c4
fix AmbiguousMatchException
louis1706 Dec 23, 2024
6c0d86c
FindingPosition Fixed
louis1706 Dec 23, 2024
fbc9d9f
OpeningGiftEvent
louis1706 Dec 23, 2024
b45131c
GrantingGift Fix
louis1706 Dec 23, 2024
1feb1d8
Merge branch 'dev' into xmas-2024-from-xmas-2023
louis1706 Dec 25, 2024
5a4d66d
Fix SpawningFlamingos
louis1706 Dec 25, 2024
e00c9eb
DamageType::Scp1507
louis1706 Dec 25, 2024
7993d22
Merge branch 'xmas-2024' into xmas-2024-from-xmas-2023
louis1706 Dec 25, 2024
247f39f
DamageType::Scp956
louis1706 Dec 25, 2024
8814841
Merge branch 'xmas-2024-from-xmas-2023' of https://github.com/louis17…
louis1706 Dec 25, 2024
61afba1
SnowBall
louis1706 Dec 25, 2024
daf010a
Fix NPC not spawning
louis1706 Dec 25, 2024
90559ba
Flamingos
louis1706 Dec 25, 2024
e183f91
Obsolete Coffee because nw didn't added it in game
louis1706 Dec 25, 2024
b0e2aa8
patch fixes and optimization
IRacle1 Dec 26, 2024
26d09d4
flamingo event to right namespace
IRacle1 Dec 26, 2024
5b31a05
or not
IRacle1 Dec 26, 2024
ffbefec
fix: il error😭😭😭
IRacle1 Dec 26, 2024
9c92b7f
fix
IRacle1 Dec 26, 2024
edc7f3e
Merge branch 'xmas-2024' into xmas-2024-from-xmas-2023
louis1706 Dec 26, 2024
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
8 changes: 4 additions & 4 deletions EXILED/Exiled.Events/Patches/Events/Scp1507/AttackingDoor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,17 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
{
List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);

int offset = -5;
int offset = -4;
int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ldloc_S) + offset;

Label continueLabel = generator.DefineLabel();

newInstructions[index].labels.Add(continueLabel);

newInstructions.InsertRange(
index,
new CodeInstruction[]
{
// Player.Get(this.Owner);
new(OpCodes.Ldarg_0),
new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
new(OpCodes.Callvirt, PropertyGetter(typeof(Scp1507AttackAbility), nameof(Scp1507AttackAbility.Owner))),
new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),

Expand All @@ -69,6 +67,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
// return false;
new(OpCodes.Ldc_I4_0),
new(OpCodes.Ret),

new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel),
});

for (int z = 0; z < newInstructions.Count; z++)
Expand Down
Loading