Merge 3.3.5 to 3.3.5-base_patch

Author: Github Actions

src/server/game/Entities/Player/Player.h

@@ -1858,6 +1858,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
 
         void SetDrunkValue(uint8 newDrunkValue, uint32 itemId = 0);
         uint8 GetDrunkValue() const { return GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_INEBRIATION); }
+        void ApplyModFakeDrunkValue(int32 mod, bool apply) { ApplyModInt32Value(PLAYER_FAKE_INEBRIATION, mod, apply); }
         int32 GetFakeDrunkValue() const { return GetInt32Value(PLAYER_FAKE_INEBRIATION); }
         void UpdateInvisibilityDrunkDetect();
         static DrunkenState GetDrunkenstateByValue(uint8 value);

src/server/game/Entities/Unit/Unit.h

@@ -21,7 +21,6 @@
 #include "Object.h"
 #include "CombatManager.h"
 #include "SpellAuraDefines.h"
-#include "PetDefines.h"
 #include "ThreatManager.h"
 #include "Timer.h"
 #include "UnitDefines.h"
@@ -94,6 +93,8 @@ class UnitAura;
 class Vehicle;
 class VehicleJoinEvent;
 
+enum PetAction : int32;
+enum class PetActionFeedback : uint8;
 enum MovementGeneratorType : uint8;
 enum ZLiquidStatus : uint32;
 

src/server/game/Movement/MotionMaster.cpp

@@ -1168,9 +1168,9 @@ void MotionMaster::DirectAdd(MovementGenerator* movement, MovementSlot slot/* =
         {
             if (!_generators.empty())
             {
-                auto where = _generators.find(movement); // find movement with equal priority
+                auto where = _generators.lower_bound(movement); // find movement with equal priority
                 bool replacesExisting = !movement->HasFlag(MOVEMENTGENERATOR_FLAG_IMMEDIATE)
-                    && where != _generators.end();
+                    && where != _generators.end() && !_generators.key_comp()(movement, *where);
                 auto top = _generators.begin();
                 if (replacesExisting)
                     Remove(where, where == top, false);

src/server/game/Spells/Auras/SpellAuraEffects.cpp

@@ -4911,7 +4911,7 @@ void AuraEffect::HandleAuraModFakeInebriation(AuraApplication const* aurApp, uin
     if (!target)
         return;
 
-    target->ApplyModInt32Value(PLAYER_FAKE_INEBRIATION, GetAmount(), apply);
+    target->ApplyModFakeDrunkValue(GetAmount(), apply);
     target->UpdateInvisibilityDrunkDetect();
 }
 

src/server/game/Spells/SpellEffects.cpp

@@ -3886,7 +3886,7 @@ void Spell::EffectInebriate()
     if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET)
         return;
 
-    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+    if (!unitTarget || !unitTarget->IsPlayer())
         return;
 
     Player* player = unitTarget->ToPlayer();
@@ -3908,7 +3908,7 @@ void Spell::EffectInebriate()
 
     player->SetDrunkValue(currentDrunk, m_CastItem ? m_CastItem->GetEntry() : 0);
 
-    if (currentDrunk == 100 && roll_chance_i(25))
+    if (currentDrunk == 100 && drunkMod > 0 && roll_chance_i(25))
         player->CastSpell(player, 67468, false);    // Drunken Vomit
 }