Skip to content

Fix potential crashes with dream grab #52

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
AAA1459 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix potential crashes with dream grab #52

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
10 changes: 4 additions & 6 deletions Code/MiscHooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ private static void Player_Update(On.Celeste.Player.orig_Update orig, Player sel
{
var data = DynamicData.For(self);

if (data.TryGet<float>("EeveeHelper_cPopDelay", out var cPopDelay) && cPopDelay > 0)
if (data.Get("EeveeHelper_cPopDelay") is float cPopDelay && cPopDelay > 0)
{
return;
}
Expand Down Expand Up @@ -646,15 +646,14 @@ private static void Player_Update(On.Celeste.Player.orig_Update orig, Player sel
private static void Player_ClimbBegin(On.Celeste.Player.orig_ClimbBegin orig, Player self)
{
orig(self);

DynamicData.For(self).Set("EeveeHelper_cPopDelay", 0f);
}

private static int Player_ClimbUpdate(On.Celeste.Player.orig_ClimbUpdate orig, Player self)
{
var data = DynamicData.For(self);

if (!data.TryGet<float>("EeveeHelper_cPopDelay", out var cPopDelay) || cPopDelay <= 0f)
if (data.Get("EeveeHelper_cPopDelay") is not float cPopDelay || cPopDelay <= 0f)
{
return orig(self);
}
Expand Down Expand Up @@ -727,9 +726,8 @@ private static bool Player_IsRiding_Solid(On.Celeste.Player.orig_IsRiding_Solid
{
if (self.StateMachine.State == Player.StClimb)
{
var data = DynamicData.For(self);

if (data.TryGet<float>("EeveeHelper_cPopDelay", out var cPopDelay) && cPopDelay > 0f)
var data = DynamicData.For(self);
if (data.Get("EeveeHelper_cPopDelay") is float cPopDelay && cPopDelay > 0f)
{
return self.CollideCheck(solid, self.Position + new Vector2((float)self.Facing, -1f));
}
Expand Down