From c92762b799fdf69ada1423848a7442c2c2873396 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Tue, 11 Aug 2026 10:45:04 -0300
Subject: [PATCH] fix(DB/Creature): Improvements to Shoot 'em Up Daily (#26807)

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Rocco Silipo <108557877+Rorschach91@users.noreply.github.com>
---
 .../updates/pending_db_world/rev_1785009873928038700.sql  | 8 ++++++++
 src/server/game/Entities/Unit/Unit.cpp                    | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1785009873928038700.sql

diff --git a/data/sql/updates/pending_db_world/rev_1785009873928038700.sql b/data/sql/updates/pending_db_world/rev_1785009873928038700.sql
new file mode 100644
index 0000000000..e324c8c518
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1785009873928038700.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 30330) AND (`source_type` = 0) AND (`id` IN (2));
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(30330, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 10000, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Jotunheim Proto-Drake - On Just Died - Despawn In 10s');
+
+UPDATE `vehicle_template_accessory` SET `minion` = 1, `summontimer` = 10000 WHERE `entry` = 30330;
+
+UPDATE `creature_template` SET `unit_flags` = 33587200 WHERE (`entry` = 30332);
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index f5a986569f..0e0e876a0e 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15831,8 +15831,11 @@ void Unit::_ExitVehicle(Position const* exitPosition)
         KnockbackFrom(pos.GetPositionX(), pos.GetPositionY(), 10.0f, 20.0f);
     }
 
-    // xinef: move fall, should we support all creatures that exited vehicle in air? Currently Quest Drag and Drop only, Air Assault quest
-    if (IsCreature() && !CanFly() && vehicleInfo && (vehicleInfo->m_ID == 113 || vehicleInfo->m_ID == 8 || vehicleInfo->m_ID == 290 || vehicleInfo->m_ID == 298))
+    // xinef: move fall for air-exit quest vehicles:
+    // Quest Drag and Drop, Air Assault, and Shoot 'em Up.
+    if (IsCreature() && !CanFly() && vehicleInfo &&
+        (vehicleInfo->m_ID == 8 || vehicleInfo->m_ID == 113 || vehicleInfo->m_ID == 228 ||
+         vehicleInfo->m_ID == 290 || vehicleInfo->m_ID == 298))
     {
         GetMotionMaster()->MoveFall();
     }