fix crash when destroying layer with players

spelunky-fyi · Oct 14, 2023 · 1a100fd · 1a100fd
1 parent d375795
commit 1a100fd
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/game_api/rpc.cpp b/src/game_api/rpc.cpp
@@ -2152,6 +2152,12 @@ void destroy_layer(uint8_t layer)
     }
     if (offset != 0)
     {
+        auto state = State::get().ptr();
+        for (auto i = 0; i < MAX_PLAYERS; ++i)
+        {
+            if (state->items->players[i] && state->items->players[i]->layer == layer)
+                state->items->players[i] = nullptr;
+        }
         auto* layer_ptr = State::get().layer(layer);
         typedef void destroy_func(Layer*);
         static destroy_func* df = (destroy_func*)(offset);