From 0cd3cbca3d21495789e2488615c7a145b826f980 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 5 Feb 2022 15:05:18 -0800
Subject: [PATCH] Hide-and-seek mod bugfixes

---
 mods/hide-and-seek.lua | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mods/hide-and-seek.lua b/mods/hide-and-seek.lua
index 787de4f3e..30e030178 100644
--- a/mods/hide-and-seek.lua
+++ b/mods/hide-and-seek.lua
@@ -75,12 +75,10 @@ function server_update(m)
     sRoundEndedTimer = sRoundEndedTimer + 1
     if sRoundEndedTimer >= sRoundIntermissionTime then
         -- reset seekers
-        if not hasHider then
-            for i=0,(MAX_PLAYERS-1) do
-                gPlayerSyncTable[i].seeking = false
-            end
-            hasSeeker = false
+        for i=0,(MAX_PLAYERS-1) do
+            gPlayerSyncTable[i].seeking = false
         end
+        hasSeeker = false
 
         -- set seeker to last one turned into seeker
         local np = gNetworkPlayers[sLastSeekerIndex]
@@ -186,6 +184,11 @@ function mario_update(m)
 end
 
 function mario_before_phys_step(m)
+    -- prevent physics from being altered when bubbled
+    if m.action == ACT_BUBBLED then
+        return
+    end
+
     -- check gamemode enabled state
     if not gGlobalSyncTable.hideAndSeek then
         return
@@ -327,5 +330,6 @@ hook_chat_command('hide-and-seek', "[on|off] turn hide-and-seek on or off", on_h
 hook_on_sync_table_change(gGlobalSyncTable, 'roundNumber', 0, on_round_number_changed)
 hook_on_sync_table_change(gGlobalSyncTable, 'roundEnded', 0, on_round_ended_changed)
 for i=0,(MAX_PLAYERS-1) do
+    gPlayerSyncTable[i].seeking = false
     hook_on_sync_table_change(gPlayerSyncTable[i], 'seeking', i, on_seeking_changed)
 end