Merge fixups

5 files changed, 7 insertions, 41 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 61e662e654c..89faa25b82e 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -27407,5 +27407,8 @@ void Player::ReadMovementInfo(WorldPacket& data, MovementInfo* mi, Movement::Ext
         !ToPlayer()->m_mover->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED),
         MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY);
 
+    REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY | MOVEMENTFLAG_CAN_FLY) && mi->HasMovementFlag(MOVEMENTFLAG_FALLING),
+        MOVEMENTFLAG_FALLING);
+
     #undef REMOVE_VIOLATING_FLAGS
 }
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 1f5213fac22..8fa176923f2 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13215,7 +13215,7 @@ void Unit::SendPetCastFail(uint8 castCount, SpellInfo const* spellInfo, SpellCas
     if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    Spell::SendCastResult(owner->ToPlayer(), spellInfo, 0, result, SPELL_CUSTOM_ERROR_NONE, SMSG_PET_CAST_FAILED);
+    Spell::SendCastResult(owner->ToPlayer(), spellInfo, castCount, result, SPELL_CUSTOM_ERROR_NONE, SMSG_PET_CAST_FAILED);
 }
 
 void Unit::SendPetActionFeedback(uint8 msg)
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index aa6936d2abf..55484123e8e 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -2597,8 +2597,9 @@ void AuraEffect::HandleAuraMounted(AuraApplication const* aurApp, uint8 mode, bo
         target->Mount(displayId, vehicleId, creatureEntry);
 
         // cast speed aura
-        if (MountCapabilityEntry const* mountCapability = sMountCapabilityStore.LookupEntry(GetAmount()))
-            target->CastSpell(target, mountCapability->SpeedModSpell, true);
+        if (mode & AURA_EFFECT_HANDLE_REAL)
+            if (MountCapabilityEntry const* mountCapability = sMountCapabilityStore.LookupEntry(GetAmount()))
+                target->CastSpell(target, mountCapability->SpeedModSpell, true);
     }
     else
     {
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 097b81fc449..2ffa96449a5 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -948,7 +948,6 @@ bool Aura::CanBeSaved() const
         case 40075: // Fel Flak Fire
         case 55849: // Power Spark
             return false;
-            break;
     }
 
     // When a druid logins, he doesnt have either eclipse power, nor the marker auras, nor the eclipse buffs. Dont save them.
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 870f7a13754..12e80339ce6 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -30,33 +30,11 @@ enum Says
     SAY_DEATH               = 6
 };
 
-enum Spells
-{
-};
-
-enum Events
-{
-};
-
-enum Events
-{
-    EVENT_STATIC_DISRUPTION     = 1,
-    EVENT_GUST_OF_WIND          = 2,
-    EVENT_CALL_LIGHTNING        = 3,
-    EVENT_ELECTRICAL_STORM      = 4,
-    EVENT_RAIN                  = 5,
-    EVENT_SUMMON_EAGLES         = 6,
-    EVENT_STORM_SEQUENCE        = 7,
-    EVENT_ENRAGE                = 8
-};
-
 class boss_akilzon : public CreatureScript
 {
     public:
         boss_akilzon() : CreatureScript("boss_akilzon") { }
 
-        boss_akilzon() : CreatureScript("boss_akilzon") { }
-
         struct boss_akilzonAI : public BossAI
         {
             boss_akilzonAI(Creature* creature) : BossAI(creature, DATA_AKILZON) { }
@@ -68,13 +46,6 @@ class boss_akilzon : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
-                events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers)
-                events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000));      // 20 to 30 seconds(bosskillers)
-                events.ScheduleEvent(EVENT_CALL_LIGHTNING, urand(10000, 20000));    // totaly random timer. can't find any info on this
-                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 60000);                // 60 seconds(bosskillers)
-                events.ScheduleEvent(EVENT_RAIN, urand(47000, 52000));
-                events.ScheduleEvent(EVENT_ENRAGE, 10*MINUTE*IN_MILLISECONDS);      // 10 minutes till enrage(bosskillers)
-
                 Talk(SAY_AGGRO);
                 _EnterCombat();
             }
@@ -113,14 +84,6 @@ class boss_akilzon : public CreatureScript
 
                 DoMeleeAttackIfReady();
             }
-
-            private:
-                uint64 BirdGUIDs[8];
-                uint64 TargetGUID;
-                uint64 CycloneGUID;
-                uint64 CloudGUID;
-                uint8  StormCount;
-                bool   isRaining;
         };
 
         CreatureAI* GetAI(Creature* creature) const