From 28c376552b832f82c9b03d60d63abbf7d81916bb Mon Sep 17 00:00:00 2001
From: Gerkiz <fs@nvfs.se>
Date: Mon, 6 Nov 2023 09:03:19 +0100
Subject: [PATCH] Mtn v3 - minor fix

---
 maps/mountain_fortress_v3/breached_wall.lua | 42 +++++++++++++++------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/maps/mountain_fortress_v3/breached_wall.lua b/maps/mountain_fortress_v3/breached_wall.lua
index 3988bd13f..19c367186 100644
--- a/maps/mountain_fortress_v3/breached_wall.lua
+++ b/maps/mountain_fortress_v3/breached_wall.lua
@@ -51,6 +51,35 @@ local collapse_message =
     end
 )
 
+local driving_state_changed_token =
+    Token.register(
+    function(event)
+        local player_index = event.player_index
+        local player = game.get_player(player_index)
+        if not player or not player.valid then
+            return
+        end
+
+        local entity = event.entity
+        if not (entity and entity.valid) then
+            return
+        end
+
+        local s = Public.get('validate_spider')
+        if entity.name == 'spidertron' then
+            if player.driving then
+                if not s[player.index] then
+                    s[player.index] = entity
+                end
+            else
+                if s[player.index] then
+                    s[player.index] = nil
+                end
+            end
+        end
+    end
+)
+
 local spidertron_unlocked =
     Token.register(
     function(event)
@@ -378,7 +407,7 @@ local function on_player_driving_changed_state(event)
         return
     end
 
-    local player = game.players[event.player_index]
+    local player = game.get_player(event.player_index)
     if not (player and player.valid) then
         return
     end
@@ -388,16 +417,7 @@ local function on_player_driving_changed_state(event)
         return
     end
 
-    local s = Public.get('validate_spider')
-    if player.driving then
-        if not s[player.index] then
-            s[player.index] = entity
-        end
-    else
-        if s[player.index] then
-            s[player.index] = nil
-        end
-    end
+    Task.set_timeout_in_ticks(15, driving_state_changed_token, {player_index = player.index, entity = entity})
 end
 
 Event.add(defines.events.on_player_changed_position, on_player_changed_position)