Merge pull request #80 from swoolcock/swoolcock/lobby-map-fix-storage

Abort displaying the lobby map if the player is not standing in front

Author: maddie480

Entities/LobbyMapWarp.cs

@@ -1,8 +1,10 @@
 using Celeste.Mod.CollabUtils2.UI;
 using Celeste.Mod.Entities;
+using Celeste.Pico8;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Monocle;
+using System;
 using System.Collections;
 
 namespace Celeste.Mod.CollabUtils2.Entities {
@@ -47,7 +49,8 @@ public override void Added(Scene scene) {
         }
 
         private void onTalk(Player player) {
-            if (player.Scene is Level level) {
+            // don't allow this to somehow trigger twice from the same action
+            if (player.Scene is Level level && level.CanRetry) {
                 level.CanRetry = false;
                 if (level.Tracker.GetEntity<LobbyMapController>() is LobbyMapController lmc) {
                     lmc.VisitManager?.ActivateWarp(info.MarkerId);
@@ -65,6 +68,15 @@ private IEnumerator activateRoutine(Player player) {
 
             player.StateMachine.State = Player.StDummy;
             yield return player.DummyWalkToExact((int)X, false, 1f, true);
+
+            // handle the case where we're dead or not on the ground in front of it
+            if (!validPlayer(player)) {
+                if (!player.Dead) {
+                    player.StateMachine.State = Player.StNormal;
+                }
+                yield break;
+            }
+
             player.Facing = playerFacing;
 
             player.Sprite.Visible = player.Hair.Visible = false;
@@ -82,11 +94,19 @@ private IEnumerator activateRoutine(Player player) {
 
             Audio.Play("event:/char/madeline/backpack_drop");
 
-            while (playerSprite.Animating) {
+            // loop until animation is finished or the player can no longer use the bench
+            while (playerSprite.Animating && validPlayer(player)) {
+                // force dummy state while animating
+                player.StateMachine.State = Player.StDummy;
                 yield return null;
             }
 
-            player.Scene.Add(new LobbyMapUI());
+            // show the UI if the player successfully sat down
+            if (validPlayer(player)) {
+                player.Scene.Add(new LobbyMapUI());
+            } else {
+                player.StateMachine.State = Player.StNormal;
+            }
 
             yield return 0.5f;
 
@@ -95,5 +115,10 @@ private IEnumerator activateRoutine(Player player) {
 
             player.Sprite.Visible = player.Hair.Visible = true;
         }
+
+        private bool validPlayer(Player player) {
+            // validates that the player is standing on the ground in front of the bench, and isn't dead
+            return (Center - player.Center).LengthSquared() < 16 * 16 && !player.Dead && player.OnGround();
+        }
     }
 }

UI/LobbyMapUI.cs

@@ -139,6 +139,12 @@ public override void Removed(Scene scene) {
         public override void Update() {
             base.Update();
 
+            // if we're somehow not on the ground, bail
+            if (Scene?.Tracker.GetEntity<Player>()?.OnGround() != true) {
+                closeScreen();
+                return;
+            }
+
             // handle input
             if (focused) {
                 if (activeWarps.Count > 0) {