Add dream tunnel collider check to new grab logic

Author: aonkeeper4

src/Components/DreamTunnelCollider.cs

@@ -59,7 +59,7 @@ public bool Check(Player player, Vector2? dir = null)
     {
         // no need for a Player_canEnterDreamTunnelCollider check like DreamDashCollider, as DreamTunnelDashAttacking is enough
         // the check is necessary in DreamDashCollider because some things give dash attack without the player needing to (be able to) dash
-        if (Active && Collider is not null && Entity != null)
+        if (Active && Collider is not null && Entity is not null)
         {
             Collider collider = Entity.Collider;
             bool collidable = Entity.Collidable;

src/States/DreamTunnelDash.cs

@@ -197,11 +197,18 @@ public static int DreamTunnelDashUpdate(this Player player)
                 }
                 else if (player.DashDir.Y >= 0f || player.DashDir.X != 0f)
                 {
-                    if (player.DashDir.X > 0f && player.CollideCheck<Solid>(player.Position - (Vector2.UnitX * 5f)))
+                    Vector2 at = player.Position - (Vector2.UnitX * 5f);
+                    if (player.DashDir.X > 0f && (
+                            player.CollideCheck<Solid>(player.Position - (Vector2.UnitX * 5f)) ||
+                            player.Scene.Tracker.GetComponents<DreamTunnelCollider>().Cast<DreamTunnelCollider>().Any(c => c.Check(player, -Vector2.UnitX * 5f))
+                        ))
                     {
                         player.MoveHExact(-5, null, null);
                     }
-                    else if (player.DashDir.X < 0f && player.CollideCheck<Solid>(player.Position + (Vector2.UnitX * 5f)))
+                    else if (player.DashDir.X < 0f && (
+                            player.CollideCheck<Solid>(player.Position + (Vector2.UnitX * 5f)) ||
+                            player.Scene.Tracker.GetComponents<DreamTunnelCollider>().Cast<DreamTunnelCollider>().Any(c => c.Check(player, Vector2.UnitX * 5f))
+                        ))
                     {
                         player.MoveHExact(5, null, null);
                     }