Skip to content

fix hook ordering with pandora's box #98

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
vitellaryjr merged 1 commit into from
Dec 30, 2025
Merged

fix hook ordering with pandora's box #98

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
11 changes: 8 additions & 3 deletions Code/FLCC/InteractiveChaser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
[Tracked]
[CustomEntity("vitellary/interactivechaser")]
public class InteractiveChaser : Entity {
internal static DetourConfig RootConfig = new("CrystallineHelper_InteractiveChaser", 0);

private const string vitellaryInteractiveChaserStates = "vitellaryInteractiveChaserStates";
private const string vitellaryChaserPosition = "vitellaryChaserPosition";
private const string vitellaryChaserMovementCounter = "vitellaryChaserMovementCounter";
Expand Down Expand Up @@ -354,9 +356,12 @@

public static void Load()
{
On.Celeste.Player.ctor += Player_ctor;
On.Celeste.Player.Die += Player_Die;
On.Celeste.Player.Update += Player_Update;
using (new DetourConfigContext(RootConfig).Use())
{
On.Celeste.Player.Die += Player_Die;
}
On.Celeste.Player.ctor += Player_ctor;
On.Celeste.Player.Update += Player_Update;
//On.Celeste.Actor.Update += Actor_Update;
On.Celeste.Player.UpdateChaserStates += Player_UpdateChaserStates;
On.Celeste.Player.OnTransition += Player_OnTransition;
Expand Down Expand Up @@ -618,13 +623,13 @@
UpdateCarry();
}

private void OnCollideH(CollisionData data)

Check warning on line 626 in Code/FLCC/InteractiveChaser.cs

View workflow job for this annotation

GitHub Actions / build 

'InteractiveChaser.DummyPlayer.OnCollideH(CollisionData)' hides inherited member 'Player.OnCollideH(CollisionData)'. Use the new keyword if hiding was intended.
{
if (DashAttacking && data.Hit != null && data.Direction.X == Math.Sign(DashDir.X) && !Blacklist.Any((s) => s == data.Hit.GetType().Name))
data.Hit.OnDashCollide?.Invoke(this, data.Direction);
}

private void OnCollideV(CollisionData data)

Check warning on line 632 in Code/FLCC/InteractiveChaser.cs

View workflow job for this annotation

GitHub Actions / build 

'InteractiveChaser.DummyPlayer.OnCollideV(CollisionData)' hides inherited member 'Player.OnCollideV(CollisionData)'. Use the new keyword if hiding was intended.
{
if (DashAttacking && data.Hit != null && data.Direction.Y == Math.Sign(DashDir.Y) && !Blacklist.Any((s) => s == data.Hit.GetType().Name))
data.Hit.OnDashCollide?.Invoke(this, data.Direction);
Expand Down
Loading