Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

github-actions[bot] · github-actions[bot] · commit 97bbac6cd6a2 · 2026-05-20T03:24:51.000Z
diff --git a/data/sql/updates/db_world/2026_05_19_00.sql b/data/sql/updates/db_world/2026_05_19_00.sql
@@ -0,0 +1,6 @@
+-- DB update 2026_05_18_02 -> 2026_05_19_00
+-- Update creature 'Ludin Farrow' with sniffed values
+-- new spawns
+DELETE FROM `creature` WHERE (`id1` IN (26546)) AND (`guid` IN (1550));
+INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES
+(1550, 26546, 0, 1, 1, 0, -3726.6103515625, -576.7655029296875, 4.643310546875, 4.171336650848388671, 120, 0, 0, 0, 0, 0, "", 45772, 1, NULL);
diff --git a/data/sql/updates/db_world/2026_05_19_01.sql b/data/sql/updates/db_world/2026_05_19_01.sql
diff --git a/src/server/apps/worldserver/worldserver.conf.dist b/src/server/apps/worldserver/worldserver.conf.dist
@@ -3388,6 +3388,16 @@ DungeonAccessRequirements.OptionalStringID = 0
 
 JoinBGAndLFG.Enable = 0
 
+#
+#     LFG.MailItemOnFullInventory
+#        Description: When a player wins a group roll but their inventory is full, mail
+#                     the item to them instead of leaving it on the corpse.
+#        Default:     0 - Disabled
+#                     1 - Only in LFG/RDF groups
+#                     2 - In all group types
+
+LFG.MailItemOnFullInventory = 0
+
 #
 #     DungeonFinder.OptionsMask
 #        Description: Dungeon and raid finder system.
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
@@ -703,13 +703,21 @@ void BattlegroundSA::OverrideGunFaction()
     for (uint8 i = BG_SA_GUN_1; i <= BG_SA_GUN_10; i++)
     {
         if (Creature* gun = GetBGCreature(i))
+        {
             gun->SetFaction(BG_SA_Factions[Attackers ? TEAM_ALLIANCE : TEAM_HORDE]);
+            // NullCreatureAI never evades and PvE combat refs have no timer,
+            // so attackers would stay in combat until death after damaging it.
+            gun->SetIsCombatDisallowed(true);
+        }
     }
 
     for (uint8 i = BG_SA_DEMOLISHER_1; i <= BG_SA_DEMOLISHER_4; i++)
     {
         if (Creature* dem = GetBGCreature(i))
+        {
             dem->SetFaction(BG_SA_Factions[Attackers]);
+            dem->SetIsCombatDisallowed(true);
+        }
     }
 }
 
@@ -968,7 +976,10 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source)
                             BG_SA_NpcSpawnlocs[j][2], BG_SA_NpcSpawnlocs[j][3], 600);
 
                 if (Creature* dem = GetBGCreature(j))
+                {
                     dem->SetFaction(BG_SA_Factions[Attackers]);
+                    dem->SetIsCombatDisallowed(true);
+                }
             }
 
             UpdateWorldState(WORLD_STATE_BATTLEGROUND_SA_LEFT_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 1 : 0));
@@ -999,7 +1010,10 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source)
                             BG_SA_NpcSpawnlocs[j][2], BG_SA_NpcSpawnlocs[j][3], 600);
 
                 if (Creature* dem = GetBGCreature(j))
+                {
                     dem->SetFaction(BG_SA_Factions[Attackers]);
+                    dem->SetIsCombatDisallowed(true);
+                }
             }
 
             UpdateWorldState(WORLD_STATE_BATTLEGROUND_SA_RIGHT_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 1 : 0));
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
@@ -1668,6 +1668,7 @@ class Player : public Unit, public GridObject<Player>
     [[nodiscard]] PlayerMails const& GetMails() const { return m_mail; }
     void SendItemRetrievalMail(uint32 itemEntry, uint32 count); // Item retrieval mails sent by The Postmaster (34337)
     void SendItemRetrievalMail(std::vector<std::pair<uint32, uint32>> mailItems); // Item retrieval mails sent by The Postmaster (34337)
+    void SendItemRetrievalMail(Item* item); // As above, but for a pre-created item (preserves randomPropertyId)
 
     /*********************************************************/
     /*** MAILED ITEMS SYSTEM ***/
diff --git a/src/server/game/Entities/Player/PlayerMisc.cpp b/src/server/game/Entities/Player/PlayerMisc.cpp
@@ -508,3 +508,16 @@ void Player::SendItemRetrievalMail(std::vector<std::pair<uint32, uint32>> mailIt
 
     CharacterDatabase.CommitTransaction(trans);
 }
+
+void Player::SendItemRetrievalMail(Item* item)
+{
+    if (!item)
+        return;
+
+    CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction();
+    item->SaveToDB(trans);
+    MailDraft("Recovered Item", "We recovered a lost item in the twisting nether and noted that it was yours.$B$BPlease find said object enclosed.")
+        .AddItem(item)
+        .SendMailTo(trans, MailReceiver(this, GetGUID().GetCounter()), MailSender(MAIL_CREATURE, 34337 /* The Postmaster */));
+    CharacterDatabase.CommitTransaction(trans);
+}
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
@@ -1498,9 +1498,22 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap)
                     }
                     else
                     {
-                        item->is_blocked = false;
-                        item->rollWinnerGUID = player->GetGUID();
-                        player->SendEquipError(msg, nullptr, nullptr, roll->itemid);
+                        uint32 mailOnFull = sWorld->getIntConfig(CONFIG_LFG_MAIL_ITEM_ON_FULL_INVENTORY);
+                        if (mailOnFull == MAIL_ITEM_ON_FULL_INVENTORY_EVERYWHERE || (mailOnFull == MAIL_ITEM_ON_FULL_INVENTORY_LFG_ONLY && isLFGGroup()))
+                        {
+                            item->is_looted = true;
+                            roll->getLoot()->NotifyItemRemoved(roll->itemSlot);
+                            roll->getLoot()->unlootedCount--;
+                            player->SendEquipError(msg, nullptr, nullptr, roll->itemid);
+                            if (Item* mailItem = Item::CreateItem(roll->itemid, item->count, player, false, item->randomPropertyId))
+                                player->SendItemRetrievalMail(mailItem);
+                        }
+                        else
+                        {
+                            item->is_blocked = false;
+                            item->rollWinnerGUID = player->GetGUID();
+                            player->SendEquipError(msg, nullptr, nullptr, roll->itemid);
+                        }
                     }
                 }
             }
@@ -1568,9 +1581,22 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap)
                         }
                         else
                         {
-                            item->is_blocked = false;
-                            item->rollWinnerGUID = player->GetGUID();
-                            player->SendEquipError(msg, nullptr, nullptr, roll->itemid);
+                            uint32 mailOnFull = sWorld->getIntConfig(CONFIG_LFG_MAIL_ITEM_ON_FULL_INVENTORY);
+                            if (mailOnFull == MAIL_ITEM_ON_FULL_INVENTORY_EVERYWHERE || (mailOnFull == MAIL_ITEM_ON_FULL_INVENTORY_LFG_ONLY && isLFGGroup()))
+                            {
+                                item->is_looted = true;
+                                roll->getLoot()->NotifyItemRemoved(roll->itemSlot);
+                                roll->getLoot()->unlootedCount--;
+                                player->SendEquipError(msg, nullptr, nullptr, roll->itemid);
+                                if (Item* mailItem = Item::CreateItem(roll->itemid, item->count, player, false, item->randomPropertyId))
+                                    player->SendItemRetrievalMail(mailItem);
+                            }
+                            else
+                            {
+                                item->is_blocked = false;
+                                item->rollWinnerGUID = player->GetGUID();
+                                player->SendEquipError(msg, nullptr, nullptr, roll->itemid);
+                            }
                         }
                     }
                     else if (rollvote == DISENCHANT)
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
@@ -128,6 +128,13 @@ enum lfgGroupFlags
     GROUP_LFG_FLAG_IS_HEROIC                = 0x004
 };
 
+enum MailItemOnFullInventory
+{
+    MAIL_ITEM_ON_FULL_INVENTORY_DISABLED    = 0,
+    MAIL_ITEM_ON_FULL_INVENTORY_LFG_ONLY    = 1,
+    MAIL_ITEM_ON_FULL_INVENTORY_EVERYWHERE  = 2,
+};
+
 enum DifficultyPreventionChangeType
 {
     DIFFICULTY_PREVENTION_CHANGE_NONE                   = 0,
diff --git a/src/server/game/World/WorldConfig.cpp b/src/server/game/World/WorldConfig.cpp
@@ -494,6 +494,8 @@ void WorldConfig::BuildConfigCache()
 
     SetConfigValue<bool>(CONFIG_ALLOW_JOIN_BG_AND_LFG, "JoinBGAndLFG.Enable", false);
 
+    SetConfigValue<uint32>(CONFIG_LFG_MAIL_ITEM_ON_FULL_INVENTORY, "LFG.MailItemOnFullInventory", 0);
+
     SetConfigValue<bool>(CONFIG_LEAVE_GROUP_ON_LOGOUT, "LeaveGroupOnLogout.Enabled", false);
 
     SetConfigValue<uint32>(CONFIG_RANDOM_ROLL_MAXIMUM, "Group.RandomRollMaximum", 1000000);
diff --git a/src/server/game/World/WorldConfig.h b/src/server/game/World/WorldConfig.h
@@ -375,6 +375,7 @@ enum ServerConfigs
     CONFIG_LOOT_NEED_BEFORE_GREED_ILVL_RESTRICTION,
     CONFIG_LFG_MAX_KICK_COUNT,
     CONFIG_LFG_KICK_PREVENTION_TIMER,
+    CONFIG_LFG_MAIL_ITEM_ON_FULL_INVENTORY,
     CONFIG_CHANGE_FACTION_MAX_MONEY,
     CONFIG_WATER_BREATH_TIMER,
     CONFIG_DAILY_RBG_MIN_LEVEL_AP_REWARD,
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -342,7 +342,7 @@ struct boss_blindeye_the_seer : public ScriptedAI
                 DoCast(target, SPELL_HEAL);
             }
             context.Repeat(7200ms);
-        }).Schedule(37500s, [this](TaskContext context)
+        }).Schedule(37500ms, [this](TaskContext context)
         {
             DoCastSelf(SPELL_GREATER_PW_SHIELD);
             _scheduler.Schedule(1200ms, [this](TaskContext)

Original file line number	Diff line number	Diff line change
`@@ -703,13 +703,21 @@ void BattlegroundSA::OverrideGunFaction()`
`703`	`703`	`for (uint8 i = BG_SA_GUN_1; i <= BG_SA_GUN_10; i++)`
`704`	`704`	`{`
`705`	`705`	`if (Creature* gun = GetBGCreature(i))`
	`706`	`+ {`
`706`	`707`	`gun->SetFaction(BG_SA_Factions[Attackers ? TEAM_ALLIANCE : TEAM_HORDE]);`
	`708`	`+ // NullCreatureAI never evades and PvE combat refs have no timer,`
	`709`	`+ // so attackers would stay in combat until death after damaging it.`
	`710`	`+ gun->SetIsCombatDisallowed(true);`
	`711`	`+ }`
`707`	`712`	`}`
`708`	`713`
`709`	`714`	`for (uint8 i = BG_SA_DEMOLISHER_1; i <= BG_SA_DEMOLISHER_4; i++)`
`710`	`715`	`{`
`711`	`716`	`if (Creature* dem = GetBGCreature(i))`
	`717`	`+ {`
`712`	`718`	`dem->SetFaction(BG_SA_Factions[Attackers]);`
	`719`	`+ dem->SetIsCombatDisallowed(true);`
	`720`	`+ }`
`713`	`721`	`}`
`714`	`722`	`}`
`715`	`723`
`@@ -968,7 +976,10 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source)`
`968`	`976`	`BG_SA_NpcSpawnlocs[j][2], BG_SA_NpcSpawnlocs[j][3], 600);`
`969`	`977`
`970`	`978`	`if (Creature* dem = GetBGCreature(j))`
	`979`	`+ {`
`971`	`980`	`dem->SetFaction(BG_SA_Factions[Attackers]);`
	`981`	`+ dem->SetIsCombatDisallowed(true);`
	`982`	`+ }`
`972`	`983`	`}`
`973`	`984`
`974`	`985`	`UpdateWorldState(WORLD_STATE_BATTLEGROUND_SA_LEFT_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 1 : 0));`
`@@ -999,7 +1010,10 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source)`
`999`	`1010`	`BG_SA_NpcSpawnlocs[j][2], BG_SA_NpcSpawnlocs[j][3], 600);`
`1000`	`1011`
`1001`	`1012`	`if (Creature* dem = GetBGCreature(j))`
	`1013`	`+ {`
`1002`	`1014`	`dem->SetFaction(BG_SA_Factions[Attackers]);`
	`1015`	`+ dem->SetIsCombatDisallowed(true);`
	`1016`	`+ }`
`1003`	`1017`	`}`
`1004`	`1018`
`1005`	`1019`	`UpdateWorldState(WORLD_STATE_BATTLEGROUND_SA_RIGHT_GY_ALLIANCE, (GraveyardStatus[i] == TEAM_ALLIANCE ? 1 : 0));`