Skip to content

Commit 8966669

Browse files
github-actions[bot]github-actions[bot]
committed
Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]
2 parents 581d2b1 + e7cf13a commit 8966669

28 files changed

Lines changed: 255 additions & 59 deletions

‎.git_commit_template.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
### TITLE
22
## Type(Scope/Subscope): Commit ultra short explanation
3-
## |---- Write below the examples with a maximum of 50 characters ----|
3+
## |---- Write below the examples with a maximum of 72 characters ----|
44
## Example 1: fix(DB/SAI): Missing spell to NPC Hogger
5-
## Example 2: fix(CORE/Raid): Phase 2 of Ragnaros
6-
## Example 3: feat(CORE/Commands): New GM command to do something
5+
## Example 2: feat(Scripts/Commands): Add .mail list and .mail return commands
6+
## Example 3: refactor(Scripts/Ulduar): Leverage DoorData and persistent data
7+
## Example 4: fix(Scripts/SlavePens): Despawn Frozen Core after Ahune emerges
8+
## Example 5: fix(Scripts/VioletHold): Prevent Sinclari from despawning
79

810

911
### DESCRIPTION
@@ -46,7 +48,7 @@
4648
## More info here https://www.conventionalcommits.org/en/v1.0.0-beta.2/
4749
## =======================================================
4850
## "Scope" can be:
49-
## CORE (core related, c++)
51+
## Core (core related, c++)
5052
## DB (database related, sql)
5153
## =======================================================
5254
## "Subscope" is optional and depends on the nature of the commit.

‎.vscode/settings.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2+
"github.copilot.chat.commitMessageGeneration.instructions": [
3+
{
4+
"file": ".git_commit_template.txt"
5+
},
6+
],
27
"files.associations": {
38
"*.dist": "properties",
49
"*.crash": "properties",

‎data/sql/updates/db_auth/2026_05_24_00.sql‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- DB update 2026_05_17_00 -> 2026_05_24_00
2+
-- RBAC permission for .pet rename (sec 3+, Admin role 196).
3+
DELETE FROM `rbac_permissions` WHERE `id` = 922;
4+
INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
5+
(922, 'Command: pet rename');
6+
7+
DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 922;
8+
INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
9+
(196, 922);

‎data/sql/updates/db_world/2026_05_24_00.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- DB update 2026_05_23_00 -> 2026_05_24_00
2+
--
3+
DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 22) AND (`SourceGroup` = 4) AND (`SourceEntry` = 30886);
4+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
5+
(22, 4, 30886, 0, 0, 23, 1, 4526, 0, 0, 1, 0, 0, '', 'Despawn Subjugated Iskalder when outside quest areas'),
6+
(22, 4, 30886, 0, 0, 23, 1, 4498, 0, 0, 1, 0, 0, '', 'Despawn Subjugated Iskalder when outside quest areas'),
7+
(22, 4, 30886, 0, 0, 23, 1, 4496, 0, 0, 1, 0, 0, '', 'Despawn Subjugated Iskalder when outside quest areas');

‎data/sql/updates/db_world/2026_05_24_01.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2026_05_24_00 -> 2026_05_24_01
2+
--
3+
UPDATE `creature_template` SET `CreatureImmunitiesId` = -375 WHERE `entry` IN (30183, 16486);

‎data/sql/updates/db_world/2026_05_24_02.sql‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-- DB update 2026_05_24_01 -> 2026_05_24_02
2+
-- acore_string entries for .pet rename command.
3+
DELETE FROM `acore_string` WHERE `entry` IN (35453, 35454);
4+
INSERT INTO `acore_string` (`entry`, `content_default`, `locale_koKR`, `locale_frFR`, `locale_deDE`, `locale_zhCN`, `locale_zhTW`, `locale_esES`, `locale_esMX`, `locale_ruRU`) VALUES
5+
(35453, 'Invalid pet name: {}.', '잘못된 펫 이름입니다: {}.', 'Nom de familier invalide : {}.', 'Ungültiger Begleitername: {}.', '无效的宠物名称: {}。', '無效的寵物名稱：{}。', 'Nombre de mascota no válido: {}.', 'Nombre de mascota no válido: {}.', 'Недопустимое имя питомца: {}.'),
6+
(35454, 'Renamed pet {0} ({1} -> {2}) for player {3} ({4}).', '플레이어 {3} ({4})의 펫 {0}의 이름을 {1}에서 {2}(으)로 변경했습니다.', 'Familier {0} renommé ({1} -> {2}) pour le joueur {3} ({4}).', 'Begleiter {0} umbenannt ({1} -> {2}) für Spieler {3} ({4}).', '已将玩家 {3} ({4}) 的宠物 {0} 重命名 ({1} -> {2})。', '已將玩家 {3} ({4}) 的寵物 {0} 重新命名（{1} -> {2}）。', 'Mascota {0} renombrada ({1} -> {2}) para el jugador {3} ({4}).', 'Mascota {0} renombrada ({1} -> {2}) para el jugador {3} ({4}).', 'Питомец {0} переименован ({1} -> {2}) у игрока {3} ({4}).');

‎src/server/apps/worldserver/worldserver.conf.dist‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3677,6 +3677,19 @@ Wintergrasp.CrashRestartTimer = 10
36773677

36783678
Wintergrasp.SkipBattleSessionCount = 3500
36793679

3680+
#
3681+
# Wintergrasp.KickVoAPlayers
3682+
# Description: Kick players from Vault of Archavon and freeze its bosses
3683+
# in the minutes leading up to a Wintergrasp battle, and
3684+
# block new entries during wartime / the 10-minute warmup.
3685+
# Requires a server restart to take effect (not reloadable).
3686+
# Default: 1 - (Enabled, players are warned then teleported to their
3687+
# homebind before the battle starts)
3688+
# 0 - (Disabled, players stay inside and bosses behave
3689+
# normally during Wintergrasp)
3690+
3691+
Wintergrasp.KickVoAPlayers = 1
3692+
36803693
#
36813694
###################################################################################################
36823695

‎src/server/game/Accounts/RBAC.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,7 @@ enum RBACPermissions
683683
RBAC_PERM_COMMAND_RESPAWN_GAMEOBJECT_ENTRY = 919,
684684
RBAC_PERM_COMMAND_DEBUG_INFO = 920,
685685
RBAC_PERM_COMMAND_DEBUG_COSMETIC = 921,
686+
RBAC_PERM_COMMAND_PET_RENAME = 922,
686687
// custom permissions 1000+
687688
RBAC_PERM_MAX
688689
};

‎src/server/game/Battlefield/BattlefieldMgr.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@ Battlefield* BattlefieldMgr::GetBattlefieldByBattleId(uint32 battleId)
112112
return nullptr;
113113
}
114114

115+
bool BattlefieldMgr::IsWintergraspAttackerVictory()
116+
{
117+
if (Battlefield* bf = GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG))
118+
return static_cast<BattlefieldWG*>(bf)->IsLastBattleAttackerVictory();
119+
return false;
120+
}
121+
115122
void BattlefieldMgr::Update(uint32 diff)
116123
{
117124
_updateTimer += diff;

‎src/server/game/Battlefield/BattlefieldMgr.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ class BattlefieldMgr
4747
Battlefield* GetBattlefieldToZoneId(uint32 zoneId);
4848
Battlefield* GetBattlefieldByBattleId(uint32 battleId);
4949

50+
// True iff the most recent Wintergrasp battle ended with the keep captured.
51+
[[nodiscard]] bool IsWintergraspAttackerVictory();
52+
5053
ZoneScript* GetZoneScript(uint32 zoneId);
5154

5255
void AddZone(uint32 zoneId, Battlefield* handle);

0 commit comments

Comments
 (0)