From e40ea0c47a044d0b9ea1c5fab8d3eb5a3e67cdca Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Mon, 9 Feb 2026 01:35:29 -0800
Subject: [PATCH] Fix taxi window close auto-mounting player on griffin

Fixes issue where closing the flight map window would incorrectly mount the
player on a griffin at spawn point. Added taxiLandingCooldown when closing
taxi window to prevent UNIT_FLAG_TAXI_FLIGHT check from re-triggering mount.
---
 src/game/game_handler.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/game/game_handler.cpp b/src/game/game_handler.cpp
index 9f10ca08..95fc5ce0 100644
--- a/src/game/game_handler.cpp
+++ b/src/game/game_handler.cpp
@@ -5377,6 +5377,10 @@ void GameHandler::closeTaxi() {
     // Clear any pending activation
     taxiActivatePending_ = false;
     onTaxiFlight_ = false;
+
+    // Set cooldown to prevent auto-mount trigger from re-applying taxi mount
+    // (The UNIT_FLAG_TAXI_FLIGHT check in handleUpdateObject won't re-trigger during cooldown)
+    taxiLandingCooldown_ = 2.0f;
 }
 
 void GameHandler::buildTaxiCostMap() {