Merge 3.3.5 to 3.3.5-nemesis_anticheat

Github Actions · Github Actions · commit 6bb93b714e0c · 2025-02-17T01:19:45.000Z
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
@@ -1672,7 +1672,7 @@ INSERT INTO `rbac_permissions` VALUES
 (44,'Receive global GM messages/texts'),
 (45,'Join channels without announce'),
 (46,'Change channel settings without being channel moderator'),
-(47,'Enables lower security than target check'),
+(47,'Can ignore non-strong lower security checks if it\'s disabled in config'),
 (48,'Enable IP, Last Login and EMail output in pinfo'),
 (49,'Forces to enter the email for confirmation on password change'),
 (50,'Allow user to check his own email with .account'),
@@ -2531,7 +2531,8 @@ INSERT INTO `updates` VALUES
 ('2024_08_28_01_auth.sql','BC5D74553AF2D92606F55C1C462D2700FE73BD34','ARCHIVED','2024-08-28 14:55:05',0),
 ('2024_08_30_00_auth.sql','BD76942F1C29AAA2450E051E7CA552672B5E331B','ARCHIVED','2024-08-30 19:24:30',0),
 ('2024_09_26_00_auth.sql','E37C3997FD7851EA360774AC568912846C448272','ARCHIVED','2024-09-26 18:27:26',0),
-('2024_11_22_00_auth.sql','F2C1D1572A3968E9E9D778EF7DC82778DF3EF887','ARCHIVED','2024-11-22 23:18:14',0);
+('2024_11_22_00_auth.sql','F2C1D1572A3968E9E9D778EF7DC82778DF3EF887','ARCHIVED','2024-11-22 23:18:14',0),
+('2025_02_14_00_auth.sql','4A30E92FF519BB41C520CDBF90019291217C26A2','RELEASED','2025-02-14 17:20:00',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/auth/3.3.5/2025_02_14_00_auth.sql b/sql/updates/auth/3.3.5/2025_02_14_00_auth.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `rbac_permissions` SET `name`='Can ignore non-strong lower security checks if it\'s disabled in config' WHERE `id`=47;
diff --git a/sql/updates/world/3.3.5/2025_02_10_00_world.sql b/sql/updates/world/3.3.5/2025_02_10_00_world.sql
@@ -0,0 +1,10 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+    'spell_gen_slow_roasted_turkey',
+    'spell_gen_cranberry_chutney',
+    'spell_gen_spice_bread_stuffing',
+    'spell_gen_pumpkin_pie',
+    'spell_gen_candied_sweet_potato'
+);
+
+DELETE FROM `spell_linked_spell` WHERE `spell_effect` = 24870;
diff --git a/sql/updates/world/3.3.5/2025_02_13_00_world.sql b/sql/updates/world/3.3.5/2025_02_13_00_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `spell_proc` WHERE `SpellId`=70656;
+INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `DisableEffectsMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
+(70656, 0, 15, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0);
diff --git a/sql/updates/world/3.3.5/2025_02_13_01_world.sql b/sql/updates/world/3.3.5/2025_02_13_01_world.sql
@@ -0,0 +1,2 @@
+-- DB/Spells: Fix Blade Barrier proc flags
+UPDATE `spell_proc` SET `SpellPhaseMask`=1 WHERE `SpellId`=-49182;
diff --git a/sql/updates/world/3.3.5/2025_02_13_02_world.sql b/sql/updates/world/3.3.5/2025_02_13_02_world.sql
@@ -0,0 +1,25 @@
+-- Fix for Orb of Orahil chain, prevent hard locked
+
+-- Remove prev quest requirements from quests "Shard of a Felhound" (4962) and "Shard of an Infernal" (4963)
+UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID` IN (4962,4963);
+
+-- Conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (4962,4963);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19,0,4962,0,0,47,0,1799,74,0,0,0,0,"","Quest 'Shard of an Infernal' can only be taken if quest 'Fragments of the Orb of Orahil' is in progress, completed and rewarded"),
+(19,0,4963,0,0,47,0,1799,74,0,0,0,0,"","Quest 'Shard of a Felhound' can only be taken if quest 'Fragments of the Orb of Orahil' is in progress, completed and rewarded");
+
+-- Script updates
+-- Spell visual more inline with what can be seen on live servers
+UPDATE `smart_scripts` SET `action_param1`=16633, `comment`="Menara - On Script - Cast 'Create Item Visual'" WHERE `entryorguid`=626600 AND `id`=2;
+
+-- Timers
+UPDATE `smart_scripts` SET `event_param1`=7000, `event_param2`=7000 WHERE `entryorguid`=626600 AND `id`=3;
+
+-- Comments
+UPDATE `smart_scripts` SET `comment`="Menara Voidrender - On Script - Remove Npc Flag Questgiver+Gossip" WHERE `entryorguid`=626600 AND `id`=0;
+UPDATE `smart_scripts` SET `comment`="Menara Voidrender - On Script - Say Line 1" WHERE `entryorguid`=626600 AND `id`=1;
+UPDATE `smart_scripts` SET `comment`="Menara Voidrender - On Script - Say Line 2" WHERE `entryorguid`=626600 AND `id`=3;
+UPDATE `smart_scripts` SET `comment`="Menara Voidrender - On Script - Complete Quest 'The Completed Orb of Noh'Orahil'" WHERE `entryorguid`=626600 AND `id`=4;
+UPDATE `smart_scripts` SET `comment`="Menara Voidrender - On Script - Complete Quest 'The Completed Orb of Dar'Orahil'" WHERE `entryorguid`=626600 AND `id`=5;
+UPDATE `smart_scripts` SET `comment`="Menara Voidrender - On Script - On Script - Add Npc Flag Questgiver+Gossip" WHERE `entryorguid`=626600 AND `id`=6;
diff --git a/sql/updates/world/3.3.5/2025_02_13_03_world.sql b/sql/updates/world/3.3.5/2025_02_13_03_world.sql
@@ -0,0 +1,41 @@
+-- Fix for "Cleansing of the Orb of Orahil" quest event
+-- Tabetha Script
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6546 AND `id`IN (0,11,12,13);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (654600,654607,654608) AND `source_type`=9;
+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`, `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
+(6546,0,0,0,19,0,100,0,4961,0,0,0,0,80,654600,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Quest 'Cleansing of the Orb of Orahil' Taken - Run Script"),
+(6546,0,11,12,40,0,100,0,4,6546,0,0,0,80,654607,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Waypoint 4 Reached - Run Script"),
+(6546,0,12,0,61,0,100,0,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Link - Set Run On"),
+(6546,0,13,0,40,0,100,0,9,6546,0,0,0,80,654608,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Waypoint 9 Reached - Run Script"),
+
+-- Tabetha Timed List 1
+(654600,9,0,0,0,0,100,0,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Script - Remove Npc Flag Questgiver+Gossip"),
+(654600,9,1,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 0"),
+(654600,9,2,0,0,0,100,0,0,0,0,0,0,53,0,6546,0,0,0,0,0,0,0,0,0,0,0,0,0,"Tabetha - On Script - Start Waypoint"),
+
+-- Tabetha Timed List 8
+(654607,9,0,0,0,0,100,0,0,0,0,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Script - Pause Waypoint"),
+(654607,9,1,0,0,0,100,0,1000,1000,0,0,0,11,9097,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Script - Cast Summon Demon of the Orb"),
+
+-- Tabetha Timed List 9
+(654608,9,0,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,2.0822,"Tabetha - On Script - Reset Orientation"),
+(654608,9,1,0,0,0,100,0,1000,1000,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tabetha - On Script - Add Npc Flag Questgiver+Gossip");
+
+-- Waypoints
+DELETE FROM `waypoints` WHERE `entry`=6546;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(6546,1,-4037.934,-3380.369,37.811,''),
+(6546,2,-4036.560,-3377.986,37.762,''),
+(6546,3,-4029.500,-3376.984,38.132,''),
+(6546,4,-4019.693,-3381.410,38.228,'Tabetha_SUMMON'),
+(6546,5,-4029.500,-3376.984,38.132,''),
+(6546,6,-4036.560,-3377.986,37.762,''),
+(6546,7,-4037.934,-3380.369,37.811,''),
+(6546,8,-4034.080,-3388.858,38.997,''),
+(6546,9,-4031.560,-3392.970,38.997,'Tabetha_STOP');
+
+-- Conditions to prevent Tabetha from stopping and summoning another Demon if one is already present
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=654607 AND `SourceId`=9;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,654607,9,0,29,1,6549,100,0,1,0,0,"","Smart Event 1 for creature Tabetha only executes if creature 'Demon of the Orb' not near"),
+(22,2,654607,9,0,29,1,6549,100,0,1,0,0,"","Smart Event 2 for creature Tabetha only executes if creature 'Demon of the Orb' not near");
diff --git a/sql/updates/world/3.3.5/2025_02_13_04_world.sql b/sql/updates/world/3.3.5/2025_02_13_04_world.sql
@@ -0,0 +1,18 @@
+-- Quest "The Completed Robe" Intro 
+
+-- Quest flag
+UPDATE `quest_template_addon` SET `SpecialFlags`=`SpecialFlags`|2 WHERE `ID`=4786;
+
+-- Menara Voidrender Script
+DELETE FROM `smart_scripts` WHERE `entryorguid`=626601 AND `source_type`=9;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6266 AND `id` IN (2,3);
+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`, `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
+
+(6266,0,2,3,19,0,100,0,4786,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Menara Voidrender - On Quest 'The Completed Robe' Taken - Store Targetlist"),
+(6266,0,3,0,61,0,100,0,0,0,0,0,0,80,626601,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Menara Voidrender - On Link - Run Script"),
+
+-- Menara Voidrender Timed List 1
+(626601,9,0,0,0,0,100,0,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Menara Voidrender - On Script - Remove Npc Flag Questgiver+Gossip"),
+(626601,9,1,0,0,0,100,0,1000,1000,0,0,0,11,16633,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Menara Voidrender - On Script - Cast 'Create Item Visual'"),
+(626601,9,2,0,0,0,100,0,7000,7000,0,0,0,15,4786,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Menara Voidrender - On Script - Complete Quest"),
+(626601,9,3,0,0,0,100,0,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Menara Voidrender - On Script - Add Npc Flag Questgiver+Gossip");
diff --git a/sql/updates/world/3.3.5/2025_02_13_05_world.sql b/sql/updates/world/3.3.5/2025_02_13_05_world.sql
@@ -0,0 +1,2 @@
+-- Fix model for creature 6546 (Tabetha)
+UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0 WHERE `DisplayID`=5375;
diff --git a/sql/updates/world/3.3.5/2025_02_14_00_world.sql b/sql/updates/world/3.3.5/2025_02_14_00_world.sql
@@ -0,0 +1,2 @@
+-- Update "Lessons Anew" Completion (RewardText)
+UPDATE `quest_offer_reward` SET `RewardText`="Greetings young $c, I'm glad to see you ready and eager to learn about the curing of poisons.$B$BWhile most druids in the past were put through pre-planned trials, your work will involve no such thing.  There has been a rash of animal poisonings in Auberdine, and the village there has been unable to cure it.  To that end, a representative there has asked Moonglade for aid and we are sending you there to aid them.  This is no exercise - the work you'll do is quite real.  Bear this in mind."  WHERE `ID`=6121;
diff --git a/sql/updates/world/3.3.5/2025_02_14_01_world.sql b/sql/updates/world/3.3.5/2025_02_14_01_world.sql
@@ -0,0 +1,2 @@
+-- Allow The Multiphase Survey quest for both sides
+UPDATE `quest_template` SET `AllowableRaces`=0 WHERE `ID`=11880;
diff --git a/src/common/Utilities/Duration.h b/src/common/Utilities/Duration.h
@@ -18,12 +18,7 @@
 #ifndef _DURATION_H_
 #define _DURATION_H_
 
-// HACKS TERRITORY
-#if __has_include(<__msvc_chrono.hpp>)
-#include <__msvc_chrono.hpp> // skip all the formatting/istream/locale/mutex bloat
-#else
 #include <chrono>
-#endif
 
 /// Milliseconds shorthand typedef.
 typedef std::chrono::milliseconds Milliseconds;
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
@@ -97,7 +97,7 @@ enum RBACPermissions
     RBAC_PERM_RECEIVE_GLOBAL_GM_TEXTMESSAGE                  = 44,
     RBAC_PERM_SILENTLY_JOIN_CHANNEL                          = 45,
     RBAC_PERM_CHANGE_CHANNEL_NOT_MODERATOR                   = 46,
-    RBAC_PERM_CHECK_FOR_LOWER_SECURITY                       = 47,
+    RBAC_PERM_CAN_IGNORE_LOWER_SECURITY_CHECK                = 47,
     RBAC_PERM_COMMANDS_PINFO_CHECK_PERSONAL_DATA             = 48,
     RBAC_PERM_EMAIL_CONFIRM_FOR_PASS_CHANGE                  = 49,
     RBAC_PERM_MAY_CHECK_OWN_EMAIL                            = 50,
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
@@ -130,7 +130,7 @@ enum BG_AB_Timers
 
 enum BG_AB_Score
 {
-    BG_AB_WARNING_NEAR_VICTORY_SCORE    = 1400,
+    BG_AB_WARNING_NEAR_VICTORY_SCORE    = 1440,
     BG_AB_MAX_TEAM_SCORE                = 1600
 };
 
@@ -197,8 +197,8 @@ enum BG_AB_Sounds
     BG_AB_SOUND_NODE_CAPTURED_HORDE     = 8213,
     BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE = 8212,
     BG_AB_SOUND_NODE_ASSAULTED_HORDE    = 8174,
-    BG_AB_SOUND_NEAR_VICTORY_ALLIANCE   = 8456,
-    BG_AB_SOUND_NEAR_VICTORY_HORDE      = 8457
+    BG_AB_SOUND_NEAR_VICTORY_ALLIANCE   = 8457,
+    BG_AB_SOUND_NEAR_VICTORY_HORDE      = 8456
 };
 
 enum BG_AB_Objectives
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
@@ -77,7 +77,7 @@ bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_ac
         return false;
 
     // ignore only for non-players for non strong checks (when allow apply command at least to same sec level)
-    if (m_session->HasPermission(rbac::RBAC_PERM_CHECK_FOR_LOWER_SECURITY) && !strong && !sWorld->getBoolConfig(CONFIG_GM_LOWER_SECURITY))
+    if (m_session->HasPermission(rbac::RBAC_PERM_CAN_IGNORE_LOWER_SECURITY_CHECK) && !strong && !sWorld->getBoolConfig(CONFIG_GM_LOWER_SECURITY))
         return false;
 
     if (target)
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -2523,8 +2523,16 @@ void GameObject::SetLootState(LootState state, Unit* unit)
     AI()->OnLootStateChanged(state, unit);
 
     // Start restock timer if the chest is partially looted or not looted at all
-    if (GetGoType() == GAMEOBJECT_TYPE_CHEST && state == GO_ACTIVATED && GetGOInfo()->chest.chestRestockTime > 0 && m_restockTime == 0)
-        m_restockTime = GameTime::GetGameTime() + GetGOInfo()->chest.chestRestockTime;
+    if (GetGoType() == GAMEOBJECT_TYPE_CHEST && state == GO_ACTIVATED)
+    {
+        GameObjectTemplate const* goInfo = GetGOInfo();
+        if (goInfo->chest.chestRestockTime > 0 && m_restockTime == 0)
+            m_restockTime = GameTime::GetGameTime() + goInfo->chest.chestRestockTime;
+
+        // If world chests were opened, despawn them after 5 minutes
+        if (goInfo->chest.chestRestockTime == 0 && GetMap()->IsWorldMap())
+            DespawnOrUnsummon(5min);
+    }
 
     if (GetGoType() == GAMEOBJECT_TYPE_DOOR) // only set collision for doors on SetGoState
         return;
diff --git a/src/server/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h
@@ -67,18 +67,19 @@ enum PetSpellType
     PETSPELL_TALENT = 2
 };
 
-enum ActionFeedback
+enum class PetActionFeedback : uint8
 {
-    FEEDBACK_NONE            = 0,
-    FEEDBACK_PET_DEAD        = 1,
-    FEEDBACK_NOTHING_TO_ATT  = 2,
-    FEEDBACK_CANT_ATT_TARGET = 3
+    None            = 0,
+    Dead            = 1,
+    NoTarget        = 2,
+    InvalidTarget   = 3,
+    NoPath          = 4
 };
 
-enum PetTalk
+enum PetAction : int32
 {
-    PET_TALK_SPECIAL_SPELL  = 0,
-    PET_TALK_ATTACK         = 1
+    PET_ACTION_SPECIAL_SPELL    = 0,
+    PET_ACTION_ATTACK           = 1
 };
 
 #define PET_FOLLOW_DIST  1.0f
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -58,6 +58,7 @@
 #include "PassiveAI.h"
 #include "PetAI.h"
 #include "Pet.h"
+#include "PetPackets.h"
 #include "Player.h"
 #include "PlayerAI.h"
 #include "QuestDef.h"
@@ -10247,30 +10248,39 @@ void Unit::TriggerAurasProcOnEvent(ProcEventInfo& eventInfo, AuraApplicationProc
 }
 
 ///----------Pet responses methods-----------------
-void Unit::SendPetActionFeedback(uint8 msg)
+void Unit::SendPetActionFeedback(PetActionFeedback msg, uint32 spellId) const
 {
     Unit* owner = GetOwner();
     if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
 
-    WorldPacket data(SMSG_PET_ACTION_FEEDBACK, 1);
-    data << uint8(msg);
-    owner->ToPlayer()->SendDirectMessage(&data);
+    WorldPackets::Pet::PetActionFeedback petActionFeedback;
+    petActionFeedback.SpellID = spellId;
+    petActionFeedback.Response = msg;
+    owner->ToPlayer()->SendDirectMessage(petActionFeedback.Write());
 }
 
-void Unit::SendPetTalk(uint32 pettalk)
+void Unit::SendPetActionSound(PetAction action) const
 {
-    Unit* owner = GetOwner();
-    if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
+    WorldPackets::Pet::PetActionSound petActionSound;
+    petActionSound.UnitGUID = GetGUID();
+    petActionSound.Action = action;
+    SendMessageToSet(petActionSound.Write(), false);
+}
+
+void Unit::SendPetDismissSound() const
+{
+    CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId());
+    if (!displayInfo)
         return;
 
-    WorldPacket data(SMSG_PET_ACTION_SOUND, 8 + 4);
-    data << uint64(GetGUID());
-    data << uint32(pettalk);
-    owner->ToPlayer()->SendDirectMessage(&data);
+    WorldPackets::Pet::PetDismissSound petDismissSound;
+    petDismissSound.ModelId = displayInfo->ModelID;
+    petDismissSound.ModelPosition = GetPosition();
+    SendMessageToSet(petDismissSound.Write(), false);
 }
 
-void Unit::SendPetAIReaction(ObjectGuid guid)
+void Unit::SendPetAIReaction(ObjectGuid guid) const
 {
     Unit* owner = GetOwner();
     if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
@@ -21,6 +21,7 @@
 #include "Object.h"
 #include "CombatManager.h"
 #include "SpellAuraDefines.h"
+#include "PetDefines.h"
 #include "ThreatManager.h"
 #include "Timer.h"
 #include "UnitDefines.h"
@@ -1707,9 +1708,10 @@ class TC_GAME_API Unit : public WorldObject
         void ClearComboPointHolders();
 
         ///----------Pet responses methods-----------------
-        void SendPetActionFeedback(uint8 msg);
-        void SendPetTalk(uint32 pettalk);
-        void SendPetAIReaction(ObjectGuid guid);
+        void SendPetActionFeedback(PetActionFeedback msg, uint32 spellId) const;
+        void SendPetActionSound(PetAction action) const;
+        void SendPetDismissSound() const;
+        void SendPetAIReaction(ObjectGuid guid) const;
         ///----------End of Pet responses methods----------
 
         void PropagateSpeedChange();
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
diff --git a/src/server/game/Server/Packets/PetPackets.cpp b/src/server/game/Server/Packets/PetPackets.cpp
diff --git a/src/server/game/Server/Packets/PetPackets.h b/src/server/game/Server/Packets/PetPackets.h
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--`
	`2`	+UPDATE `rbac_permissions` SET `name`='Can ignore non-strong lower security checks if it\'s disabled in config' WHERE `id`=47;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- DB/Spells: Fix Blade Barrier proc flags`
	`2`	+UPDATE `spell_proc` SET `SpellPhaseMask`=1 WHERE `SpellId`=-49182;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- Fix model for creature 6546 (Tabetha)`
	`2`	+UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0 WHERE `DisplayID`=5375;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- Update "Lessons Anew" Completion (RewardText)`
	`2`	+UPDATE `quest_offer_reward` SET `RewardText`="Greetings young $c, I'm glad to see you ready and eager to learn about the curing of poisons.$B$BWhile most druids in the past were put through pre-planned trials, your work will involve no such thing. There has been a rash of animal poisonings in Auberdine, and the village there has been unable to cure it. To that end, a representative there has asked Moonglade for aid and we are sending you there to aid them. This is no exercise - the work you'll do is quite real. Bear this in mind." WHERE `ID`=6121;