Skip to content

Commit 99e673a

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-skip-dk
2 parents 987126d + fa4b904 commit 99e673a

File tree

83 files changed

+472
-406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+472
-406
lines changed

‎sql/updates/world/3.3.5/2025_09_28_00_world.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- Add pre quest for Loyal Companions quest
2+
DELETE FROM `quest_template_addon` WHERE `ID`=12865;
3+
INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `BreadcrumbForQuestId`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
4+
(12865, 0, 0, 0, 12863, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);

‎sql/updates/world/3.3.5/2025_09_28_01_world.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- Add pre quest for Unwelcome Guests quest
2+
DELETE FROM `quest_template_addon` WHERE `ID`=12876;
3+
INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `BreadcrumbForQuestId`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
4+
(12876, 0, 0, 0, 12874, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);

‎sql/updates/world/3.3.5/2025_09_28_02_world.sql‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
-- Update creature_template minlevel/maxlevel values.
2+
UPDATE `creature_template` SET `maxlevel`=4 WHERE `entry`=80; -- Kobold Laborer
3+
UPDATE `creature_template` SET `minlevel`=15 WHERE `entry`=121; -- Defias Pathstalker
4+
UPDATE `creature_template` SET `minlevel`=13 WHERE `entry`=123; -- Riverpaw Mongrel
5+
UPDATE `creature_template` SET `minlevel`=29 WHERE `entry`=206; -- Nightbane Vile Fang
6+
UPDATE `creature_template` SET `minlevel`=23 WHERE `entry`=579; -- Shadowhide Assassin
7+
UPDATE `creature_template` SET `maxlevel`=33 WHERE `entry`=940; -- Kurzen Medicine Man
8+
UPDATE `creature_template` SET `maxlevel`=12 WHERE `entry`=1231; -- Grif Wildheart <Hunter Trainer>
9+
UPDATE `creature_template` SET `minlevel`=16 WHERE `entry`=1725; -- Defias Watchman
10+
UPDATE `creature_template` SET `maxlevel`=50 WHERE `entry`=2505; -- Saltwater Snapjaw
11+
UPDATE `creature_template` SET `minlevel`=13 WHERE `entry`=456; -- Murloc Minor Oracle
12+
UPDATE `creature_template` SET `maxlevel`=24 WHERE `entry`=615; -- Blackrock Tracker
13+
UPDATE `creature_template` SET `maxlevel`=37 WHERE `entry`=873; -- Saltscale Oracle
14+
UPDATE `creature_template` SET `minlevel`=8, `maxlevel`=11 WHERE `entry`=1240; -- Boran Ironclink <Armorer>
15+
UPDATE `creature_template` SET `minlevel`=8 WHERE `entry`=1245; -- Kogan Forgestone
16+
UPDATE `creature_template` SET `minlevel`=8, `maxlevel`=12 WHERE `entry`=1255; -- Prospector Gehn <Explorers' League>
17+
UPDATE `creature_template` SET `maxlevel`=11 WHERE `entry`=1355; -- Cook Ghilm <Cooking Trainer>
18+
UPDATE `creature_template` SET `maxlevel`=10 WHERE `entry`=1358; -- Miner Grothor
19+
UPDATE `creature_template` SET `minlevel`=8, `maxlevel`=10 WHERE `entry`=1360; -- Miner Grumnal
20+
UPDATE `creature_template` SET `minlevel`=16 WHERE `entry`=1725; -- Defias Watchman
21+
UPDATE `creature_template` SET `minlevel`=18, `maxlevel`=20 WHERE `entry`=2140; -- Edwin Harly <General Supplies>
22+
UPDATE `creature_template` SET `maxlevel`=20 WHERE `entry`=3556; -- Andrew Hilbert <Trade Supplies>
23+
UPDATE `creature_template` SET `maxlevel`=23 WHERE `entry`=4463; -- Blackrock Summoner
24+
UPDATE `creature_template` SET `minlevel`=32 WHERE `entry`=4638; -- Magram Scout
25+
UPDATE `creature_template` SET `maxlevel`=46 WHERE `entry`=5261; -- Enthralled Atal'ai
26+
UPDATE `creature_template` SET `maxlevel`=45 WHERE `entry`=5295; -- Enraged Feral Scar
27+
UPDATE `creature_template` SET `minlevel`=43 WHERE `entry`=5334; -- Hatecrest Myrmidon
28+
UPDATE `creature_template` SET `minlevel`=49 WHERE `entry`=5358; -- Cliff Giant
29+
UPDATE `creature_template` SET `minlevel`=47 WHERE `entry`=5361; -- Wave Strider
30+
UPDATE `creature_template` SET `maxlevel`=47 WHERE `entry`=5434; -- Coral Shark
31+
UPDATE `creature_template` SET `minlevel`=44 WHERE `entry`=5623; -- Wastewander Assassin
32+
UPDATE `creature_template` SET `maxlevel`=19 WHERE `entry`=5835; -- Foreman Grills
33+
UPDATE `creature_template` SET `minlevel`=29 WHERE `entry`=6115; -- Roaming Felguard
34+
UPDATE `creature_template` SET `minlevel`=25 WHERE `entry`=6206; -- Caverndeep Burrower
35+
UPDATE `creature_template` SET `minlevel`=25 WHERE `entry`=6207; -- Caverndeep Ambusher
36+
UPDATE `creature_template` SET `minlevel`=51 WHERE `entry`=7031; -- Obsidian Elemental
37+
UPDATE `creature_template` SET `minlevel`=19 WHERE `entry`=7170; -- Thragomm <Horde Runner>
38+
UPDATE `creature_template` SET `minlevel`=36 WHERE `entry`=7334; -- Battle Boar Horror
39+
UPDATE `creature_template` SET `minlevel`=30 WHERE `entry`=8118; -- Lillian Singh <Holiday Fireworks Vendor>
40+
UPDATE `creature_template` SET `minlevel`=40 WHERE `entry`=8276; -- Soaring Razorbeak
41+
UPDATE `creature_template` SET `maxlevel`=55 WHERE `entry`=8519; -- Blighted Surge
42+
UPDATE `creature_template` SET `minlevel`=57 WHERE `entry`=8522; -- Plague Monstrosity
43+
UPDATE `creature_template` SET `minlevel`=51 WHERE `entry`=9464; -- Overlord Ror
44+
UPDATE `creature_template` SET `minlevel`=57 WHERE `entry`=10916; -- Winterfall Runner
45+
UPDATE `creature_template` SET `maxlevel`=15 WHERE `entry`=11321; -- Molten Elemental
46+
UPDATE `creature_template` SET `maxlevel`=28 WHERE `entry`=11684; -- Warsong Shredder
47+
UPDATE `creature_template` SET `maxlevel`=59 WHERE `entry`=11745; -- Cyclone Warrior
48+
UPDATE `creature_template` SET `minlevel`=69 WHERE `entry`=12380; -- Unliving Resident
49+
UPDATE `creature_template` SET `maxlevel`=58 WHERE `entry`=14395; -- Griniblix the Spectator
50+
UPDATE `creature_template` SET `minlevel`=61 WHERE `entry`=14750; -- Gurubashi Bat Rider
51+
UPDATE `creature_template` SET `minlevel`=60 WHERE `entry`=15043; -- Zulian Crocolisk
52+
UPDATE `creature_template` SET `maxlevel`=70 WHERE `entry`=16407; -- Spectral Servant
53+
UPDATE `creature_template` SET `maxlevel`=30 WHERE `entry`=16541; -- Ghostlands Guardian
54+
UPDATE `creature_template` SET `maxlevel`=59 WHERE `entry`=17006; -- Elsaana
55+
UPDATE `creature_template` SET `minlevel`=60 WHERE `entry`=17052; -- Rumatu
56+
UPDATE `creature_template` SET `minlevel`=35 WHERE `entry`=17095; -- Balandar Brightstar
57+
UPDATE `creature_template` SET `maxlevel`=67 WHERE `entry`=17160; -- Living Cyclone

‎sql/updates/world/3.3.5/2025_09_29_00_world_2014_10_22_00_world.sql‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
UPDATE `trinity_string` SET `content_default`='New ArenaTeam created [Name: "%s"][Id: %u][Type: %u][Captain: %s]' WHERE `entry`=864;
2+
UPDATE `trinity_string` SET `content_default`='Name:"%s"[%s] - PR: %u - %s' WHERE `entry`=869;
3+
UPDATE `trinity_string` SET `content_default`='SetData performed on [%s, name: %s] Field: %u, Data: %u, with %s' WHERE `entry`=555;
4+
UPDATE `trinity_string` SET `content_default`='| %80s | %20s | %15s (%10u) | %19s |' WHERE `entry`=1017;
5+
UPDATE `trinity_string` SET `content_default`='%s Name: %s Account: %s (%u) Date: %s' WHERE `entry`=1026;
6+
UPDATE `trinity_string` SET `content_default`='Character ''%s'' (%s Account %u) can''t be restored: account not exist!' WHERE `entry`=1023;
7+
UPDATE `trinity_string` SET `content_default`='Character ''%s'' (%s Account %u) can''t be restored: account character list full!' WHERE `entry`=1024;
8+
UPDATE `trinity_string` SET `content_default`='Character ''%s'' (%s Account %u) can''t be restored: new name already used!' WHERE `entry`=1025;
9+
UPDATE `trinity_string` SET `content_default`='Forced rename for player %s (%s) will be requested at next login.' WHERE `entry`=254;
10+
UPDATE `trinity_string` SET `content_default`='Customization for Player %s (%s) will be requested at next login.' WHERE `entry`=346;
11+
UPDATE `trinity_string` SET `content_default`='Player %s (%s) Account %s (Id: %u) deleted.' WHERE `entry`=1009;
12+
UPDATE `trinity_string` SET `content_default`='GameObject (GUID: %u) is referenced by nonexisting %s, can''t be deleted.' WHERE `entry`=274;
13+
UPDATE `trinity_string` SET `content_default`='id: %d %s effmask: %d charges: %d stack: %d slot %d duration: %d maxduration: %d %s %s caster: %s %s' WHERE `entry`=468;
14+
UPDATE `trinity_string` SET `content_default`='Mail List Info: # of mails: %u, Player: %s (%s)' WHERE `entry`=1151;
15+
UPDATE `trinity_string` SET `content_default`='Name: %s (%s), Zone: %s, Phase: %u, %s, Flags: %s, Roles: %s' WHERE `entry`=1150;
16+
UPDATE `trinity_string` SET `content_default`='Object %s' WHERE `entry`=201;
17+
UPDATE `trinity_string` SET `content_default`='│Player %s %s (%s)' WHERE `entry`=453;
18+
UPDATE `trinity_string` SET `content_default`='The value index %u is too big for %s (count: %u).' WHERE `entry`=564;
19+
UPDATE `trinity_string` SET `content_default`='You set %s field: %u to uint32 value: %u' WHERE `entry`=566;
20+
UPDATE `trinity_string` SET `content_default`='You set %s field: %u to float value: %f' WHERE `entry`=568;
21+
UPDATE `trinity_string` SET `content_default`='The uint32 value of %s in %u is: %u' WHERE `entry`=570;
22+
UPDATE `trinity_string` SET `content_default`='The float of %s value in %u is: %f' WHERE `entry`=572;
23+
UPDATE `trinity_string` SET `content_default`='| Guild Master: %s (%s)' WHERE `entry`=1178;

‎sql/updates/world/3.3.5/2025_09_29_01_world_2014_10_23_00_world.sql‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
UPDATE `trinity_string` SET `content_default`='NPC currently selected by player:\nName: %s\nSpawnID: %u.\nGUID: %s.\nEntry: %u.\nFaction: %u.\nNPC Flags: %u.\nDisplayID: %u (Native: %u).' WHERE `entry`=539;
2+
UPDATE `trinity_string` SET `content_default`='%s, faction is %i, flags is %i, npcflag is %i, dynflag flag is %i.' WHERE `entry`=128;
3+
UPDATE `trinity_string` SET `content_default`='You changed %s Faction to %i, flags to %i, npcflag to %i, dynflag to %i.' WHERE `entry`=130;
4+
UPDATE `trinity_string` SET `content_default`='%s (%s) movement generators stack:' WHERE `entry`=526;
5+
UPDATE `trinity_string` SET `content_default`=' Targeted to player %s (%s)' WHERE `entry`=532;
6+
UPDATE `trinity_string` SET `content_default`=' Targeted to creature %s (%s)' WHERE `entry`=533;
7+
UPDATE `trinity_string` SET `content_default`=' Follow player %s (%s)' WHERE `entry`=1139;
8+
UPDATE `trinity_string` SET `content_default`=' Follow creature %s (%s)' WHERE `entry`=1140;
9+
UPDATE `trinity_string` SET `content_default`='%s updateIndex: %i, value: %i.' WHERE `entry`=562;
10+
UPDATE `trinity_string` SET `content_default`='You change %s UpdateIndex: %i value to %i.' WHERE `entry`=563;

‎sql/updates/world/3.3.5/2025_09_29_02_world_2014_10_23_01_world.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UPDATE `trinity_string` SET `content_default`='%s - owner: %s (%s account: %u) %s' WHERE `entry`=508;

‎sql/updates/world/3.3.5/2025_10_01_00_world.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- Fix Illidan Stormrage health and unit_class
2+
UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=22917;
3+
UPDATE `creature` SET `curhealth`=4249280 WHERE `guid`=52484;

‎src/server/database/Database/Implementation/CharacterDatabase.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
5151
"cb.guid, cd.genitive FROM characters AS c LEFT JOIN character_pet AS cp ON c.guid = cp.owner AND cp.slot = ? "
5252
"LEFT JOIN character_declinedname AS cd ON c.guid = cd.guid LEFT JOIN guild_member AS gm ON c.guid = gm.guid "
5353
"LEFT JOIN character_banned AS cb ON c.guid = cb.guid AND cb.active = 1 WHERE c.account = ? AND c.deleteInfos_Name IS NULL ORDER BY c.guid", CONNECTION_ASYNC);
54-
PrepareStatement(CHAR_SEL_FREE_NAME, "SELECT guid, name, at_login FROM characters WHERE guid = ? AND account = ? AND NOT EXISTS (SELECT NULL FROM characters WHERE name = ?)", CONNECTION_ASYNC);
54+
PrepareStatement(CHAR_SEL_FREE_NAME, "SELECT name, at_login FROM characters WHERE guid = ? AND account = ? AND NOT EXISTS (SELECT NULL FROM characters WHERE name = ?)", CONNECTION_ASYNC);
5555
PrepareStatement(CHAR_SEL_CHAR_ZONE, "SELECT zone FROM characters WHERE guid = ?", CONNECTION_SYNCH);
5656
PrepareStatement(CHAR_SEL_CHARACTER_NAME_DATA, "SELECT race, class, gender, level, name FROM characters WHERE guid = ?", CONNECTION_SYNCH);
5757
PrepareStatement(CHAR_SEL_CHAR_POSITION_XYZ, "SELECT map, position_x, position_y, position_z FROM characters WHERE guid = ?", CONNECTION_SYNCH);
@@ -141,7 +141,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
141141
PrepareStatement(CHAR_UPD_MAIL_ITEM_RECEIVER, "UPDATE mail_items SET receiver = ? WHERE item_guid = ?", CONNECTION_ASYNC);
142142
PrepareStatement(CHAR_UPD_ITEM_OWNER, "UPDATE item_instance SET owner_guid = ? WHERE guid = ?", CONNECTION_ASYNC);
143143

144-
PrepareStatement(CHAR_SEL_ITEM_REFUNDS, "SELECT player_guid, paidMoney, paidExtendedCost FROM item_refund_instance WHERE item_guid = ? AND player_guid = ? LIMIT 1", CONNECTION_SYNCH);
144+
PrepareStatement(CHAR_SEL_ITEM_REFUNDS, "SELECT paidMoney, paidExtendedCost FROM item_refund_instance WHERE item_guid = ? AND player_guid = ? LIMIT 1", CONNECTION_SYNCH);
145145
PrepareStatement(CHAR_SEL_ITEM_BOP_TRADE, "SELECT allowedPlayers FROM item_soulbound_trade_data WHERE itemGuid = ? LIMIT 1", CONNECTION_SYNCH);
146146
PrepareStatement(CHAR_DEL_ITEM_BOP_TRADE, "DELETE FROM item_soulbound_trade_data WHERE itemGuid = ? LIMIT 1", CONNECTION_ASYNC);
147147
PrepareStatement(CHAR_INS_ITEM_BOP_TRADE, "INSERT INTO item_soulbound_trade_data VALUES (?, ?)", CONNECTION_ASYNC);
@@ -211,7 +211,6 @@ void CharacterDatabaseConnection::DoPrepareStatements()
211211
PrepareStatement(CHAR_UPD_GUILD_BANK_TAB_INFO, "UPDATE guild_bank_tab SET TabName = ?, TabIcon = ? WHERE guildid = ? AND TabId = ?", CONNECTION_ASYNC);
212212
PrepareStatement(CHAR_UPD_GUILD_BANK_MONEY, "UPDATE guild SET BankMoney = ? WHERE guildid = ?", CONNECTION_ASYNC); // 0: uint64, 1: uint32
213213
// 0: uint8, 1: uint32, 2: uint8, 3: uint32
214-
PrepareStatement(CHAR_UPD_GUILD_BANK_EVENTLOG_TAB, "UPDATE guild_bank_eventlog SET TabId = ? WHERE guildid = ? AND TabId = ? AND LogGuid = ?", CONNECTION_ASYNC);
215214
PrepareStatement(CHAR_UPD_GUILD_RANK_BANK_MONEY, "UPDATE guild_rank SET BankMoneyPerDay = ? WHERE rid = ? AND guildid = ?", CONNECTION_ASYNC); // 0: uint32, 1: uint8, 2: uint32
216215
PrepareStatement(CHAR_UPD_GUILD_BANK_TAB_TEXT, "UPDATE guild_bank_tab SET TabText = ? WHERE guildid = ? AND TabId = ?", CONNECTION_ASYNC); // 0: string, 1: uint32, 2: uint8
217216

@@ -418,7 +417,6 @@ void CharacterDatabaseConnection::DoPrepareStatements()
418417
PrepareStatement(CHAR_SEL_CHAR_HOMEBIND, "SELECT mapId, zoneId, posX, posY, posZ FROM character_homebind WHERE guid = ?", CONNECTION_SYNCH);
419418
PrepareStatement(CHAR_SEL_CHAR_GUID_NAME_BY_ACC, "SELECT guid, name, online FROM characters WHERE account = ?", CONNECTION_SYNCH);
420419
PrepareStatement(CHAR_SEL_CHARACTER_AT_LOGIN, "SELECT at_login FROM characters WHERE guid = ?", CONNECTION_SYNCH);
421-
PrepareStatement(CHAR_SEL_CHAR_CLASS_LVL_AT_LOGIN, "SELECT class, level, at_login, knownTitles FROM characters WHERE guid = ?", CONNECTION_SYNCH);
422420
PrepareStatement(CHAR_SEL_CHAR_CUSTOMIZE_INFO, "SELECT name, race, class, gender, at_login FROM characters WHERE guid = ?", CONNECTION_ASYNC);
423421
PrepareStatement(CHAR_SEL_CHAR_RACE_OR_FACTION_CHANGE_INFOS, "SELECT c.at_login, c.knownTitles, gm.guid, c.map FROM characters c LEFT JOIN group_member gm ON c.guid = gm.memberGuid WHERE c.guid = ?", CONNECTION_ASYNC);
424422
PrepareStatement(CHAR_SEL_INSTANCE, "SELECT data, completedEncounters FROM instance WHERE map = ? AND id = ?", CONNECTION_SYNCH);

‎src/server/database/Database/Implementation/CharacterDatabase.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ enum CharacterDatabaseStatements : uint32
182182
CHAR_UPD_GUILD_EMBLEM_INFO,
183183
CHAR_UPD_GUILD_BANK_TAB_INFO,
184184
CHAR_UPD_GUILD_BANK_MONEY,
185-
CHAR_UPD_GUILD_BANK_EVENTLOG_TAB,
186185
CHAR_UPD_GUILD_RANK_BANK_MONEY,
187186
CHAR_UPD_GUILD_BANK_TAB_TEXT,
188187
CHAR_INS_GUILD_MEMBER_WITHDRAW,
@@ -347,7 +346,6 @@ enum CharacterDatabaseStatements : uint32
347346
CHAR_SEL_CHAR_HOMEBIND,
348347
CHAR_SEL_CHAR_GUID_NAME_BY_ACC,
349348
CHAR_SEL_CHARACTER_AT_LOGIN,
350-
CHAR_SEL_CHAR_CLASS_LVL_AT_LOGIN,
351349
CHAR_SEL_CHAR_CUSTOMIZE_INFO,
352350
CHAR_SEL_CHAR_RACE_OR_FACTION_CHANGE_INFOS,
353351
CHAR_SEL_INSTANCE,

‎src/server/game/AI/SmartScripts/SmartScript.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
316316
mUseTextTimer = true;
317317
sCreatureTextMgr->SendChat(talker, uint8(e.action.talk.textGroupID), talkTarget);
318318
TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: {} {}, textGuid: {}",
319-
talker->GetName(), talker->GetGUID().ToString(), talkTarget ? talkTarget->GetGUID().ToString() : "0");
319+
talker->GetName(), talker->GetGUID().ToString(), talkTarget ? talkTarget->GetGUID().ToString() : "Empty");
320320
break;
321321
}
322322
case SMART_ACTION_SIMPLE_TALK:

0 commit comments

Comments
 (0)