Skip to content

Commit d2e2c85

Browse files
authored
Merge pull request #52 from AAA1459/fixAone
Fix potential crashes with dream grab
2 parents d63385c + 6ab0602 commit d2e2c85

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

Code/MiscHooks.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ private static void Player_Update(On.Celeste.Player.orig_Update orig, Player sel
616616
{
617617
var data = DynamicData.For(self);
618618

619-
if (data.TryGet<float>("EeveeHelper_cPopDelay", out var cPopDelay) && cPopDelay > 0)
619+
if (data.Get("EeveeHelper_cPopDelay") is float cPopDelay && cPopDelay > 0)
620620
{
621621
return;
622622
}
@@ -646,15 +646,14 @@ private static void Player_Update(On.Celeste.Player.orig_Update orig, Player sel
646646
private static void Player_ClimbBegin(On.Celeste.Player.orig_ClimbBegin orig, Player self)
647647
{
648648
orig(self);
649-
650649
DynamicData.For(self).Set("EeveeHelper_cPopDelay", 0f);
651650
}
652651

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

657-
if (!data.TryGet<float>("EeveeHelper_cPopDelay", out var cPopDelay) || cPopDelay <= 0f)
656+
if (data.Get("EeveeHelper_cPopDelay") is not float cPopDelay || cPopDelay <= 0f)
658657
{
659658
return orig(self);
660659
}
@@ -727,9 +726,8 @@ private static bool Player_IsRiding_Solid(On.Celeste.Player.orig_IsRiding_Solid
727726
{
728727
if (self.StateMachine.State == Player.StClimb)
729728
{
730-
var data = DynamicData.For(self);
731-
732-
if (data.TryGet<float>("EeveeHelper_cPopDelay", out var cPopDelay) && cPopDelay > 0f)
729+
var data = DynamicData.For(self);
730+
if (data.Get("EeveeHelper_cPopDelay") is float cPopDelay && cPopDelay > 0f)
733731
{
734732
return self.CollideCheck(solid, self.Position + new Vector2((float)self.Facing, -1f));
735733
}

0 commit comments

Comments
 (0)