prepare merge

Author: Shauren

…tes/world/3.3.5/2026_06_280_00_world.sql …ates/world/3.3.5/2026_07_18_02_world.sqlsql/updates/world/3.3.5/2026_06_280_00_world.sql renamed to sql/updates/world/3.3.5/2026_07_18_02_world.sql sql/updates/world/3.3.5/2026_06_280_00_world.sql renamed to sql/updates/world/3.3.5/2026_07_18_02_world.sql

@@ -439,14 +439,14 @@ class spell_omrogg_beatdown : public SpellScript
 
     void HandleAfterCast()
     {
-        if (Creature* creature = GetCaster()->ToCreature())
-        {
-            creature->GetThreatManager().ResetAllThreat();
+        Unit* caster = GetCaster();
+        if (!caster->IsCreature())
+            return;
 
-            if (creature->GetAI())
-                if (Unit* target = creature->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true))
-                    creature->AI()->AttackStart(target);
-        }
+        caster->GetThreatManager().ResetAllThreat();
+
+        if (Unit* target = caster->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true))
+            caster->GetAI()->AttackStart(target);
     }
 
     void Register() override