Skip to content

Commit 380544d

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-base_patch
2 parents 1aec1ba + 0feceb9 commit 380544d

66 files changed

Lines changed: 1359 additions & 1060 deletions

Some content is hidden

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

‎sql/updates/world/3.3.5/2026_07_02_00_world.sql‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ALTER TABLE `quest_template_locale`
2+
CHANGE `Title` `LogTitle` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL AFTER `locale`,
3+
CHANGE `Objectives` `LogDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL AFTER `LogTitle`,
4+
CHANGE `Details` `QuestDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL AFTER `LogDescription`,
5+
CHANGE `EndText` `AreaDescription` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL AFTER `QuestDescription`,
6+
CHANGE `CompletedText` `QuestCompletionLog` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL AFTER `AreaDescription`;

‎sql/updates/world/3.3.5/2026_07_04_00_world.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
--
2+
DELETE FROM `waypoint_data` WHERE `id` = 578530;
3+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `action`, `orientation`, `move_type`, `action_chance`) VALUES
4+
(578530,1,178.51125,287.97794,-8.183065,0,0,NULL,0,100),
5+
(578530,2,171.82281,289.97687,-8.185595,0,0,NULL,0,100),
6+
(578530,3,178.51125,287.97794,-8.183065,0,0,NULL,0,100),
7+
(578530,4,184.78966,290.36990,-8.181390,0,0,NULL,0,100);

‎sql/updates/world/3.3.5/2026_07_04_01_world.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ALTER TABLE `quest_request_items`
2+
ADD `EmoteOnCompleteDelay` int unsigned NOT NULL DEFAULT 0 AFTER `EmoteOnIncomplete`,
3+
ADD `EmoteOnIncompleteDelay` int unsigned NOT NULL DEFAULT 0 AFTER `EmoteOnCompleteDelay`;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2328,7 +2328,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
23282328
}
23292329
case SMART_ACTION_RESUME_MOVEMENT:
23302330
{
2331-
for (WorldObject* const target : targets)
2331+
for (WorldObject* target : targets)
23322332
if (IsUnit(target))
23332333
target->ToUnit()->ResumeMovement(e.action.resumeMovement.resumeTimer, e.action.resumeMovement.movementSlot);
23342334
break;

‎src/server/game/Achievements/AchievementMgr.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ typedef std::unordered_map<uint32, AchievementEntryList> AchievementList
4646

4747
struct CriteriaProgress
4848
{
49-
uint32 counter;
50-
time_t date; // latest update time.
51-
bool changed;
49+
uint32 counter = 0;
50+
time_t date = time_t(0); // latest update time.
51+
bool changed = false;
5252
};
5353

5454
enum AchievementCriteriaDataType

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,6 @@ GameObject* Battlefield::SpawnGameObject(uint32 entry, Position const& pos, Quat
815815
if (!go->Create(map->GenerateLowGuid<HighGuid::GameObject>(), entry, map, PHASEMASK_NORMAL, pos, rot, 255, GO_STATE_READY))
816816
{
817817
TC_LOG_ERROR("bg.battlefield", "Battlefield::SpawnGameObject: Gameobject template {} could not be found in the database! Battlefield has not been created!", entry);
818-
TC_LOG_ERROR("bg.battlefield", "Battlefield::SpawnGameObject: Could not create gameobject template {}! Battlefield has not been created!", entry);
819818
delete go;
820819
return nullptr;
821820
}

‎src/server/game/Chat/Channels/Channel.cpp‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,10 +812,18 @@ void Channel::SilenceAll(Player const* /*player*/, std::string const& /*name*/)
812812
{
813813
}
814814

815+
void Channel::SilenceVoice(Player const* /*player*/, std::string const& /*name*/)
816+
{
817+
}
818+
815819
void Channel::UnsilenceAll(Player const* /*player*/, std::string const& /*name*/)
816820
{
817821
}
818822

823+
void Channel::UnsilenceVoice(Player const* /*player*/, std::string const& /*name*/)
824+
{
825+
}
826+
819827
void Channel::DeclineInvite(Player const* /*player*/)
820828
{
821829
}
@@ -859,6 +867,23 @@ void Channel::LeaveNotify(ObjectGuid const& guid) const
859867
SendToAll(builder);
860868
}
861869

870+
void Channel::SendMemberCount(Player const* player) const
871+
{
872+
WorldPackets::Channel::ChannelMemberCount channelMemberCount;
873+
channelMemberCount.ChannelName = GetName(player->GetSession()->GetSessionDbcLocale());
874+
channelMemberCount._ChannelFlags = GetFlags();
875+
channelMemberCount.MemberCount = GetNumPlayers();
876+
player->SendDirectMessage(channelMemberCount.Write());
877+
}
878+
879+
void Channel::VoiceOn(Player const* /*player*/)
880+
{
881+
}
882+
883+
void Channel::VoiceOff(Player const* /*player*/)
884+
{
885+
}
886+
862887
template <class Builder>
863888
void Channel::SendToAll(Builder& builder, ObjectGuid const& guid) const
864889
{

‎src/server/game/Chat/Channels/Channel.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ class TC_GAME_API Channel
218218
void SetMute(Player const* player, std::string const& newname) { SetMode(player, newname, false, true); }
219219
void UnsetMute(Player const* player, std::string const& newname) { SetMode(player, newname, false, false); }
220220
void SilenceAll(Player const* player, std::string const& name);
221+
void SilenceVoice(Player const* player, std::string const& name);
221222
void UnsilenceAll(Player const* player, std::string const& name);
223+
void UnsilenceVoice(Player const* player, std::string const& name);
222224
void List(Player const* player) const;
223225
void Announce(Player const* player);
224226
void Say(ObjectGuid const& guid, std::string const& what, uint32 lang) const;
@@ -227,6 +229,9 @@ class TC_GAME_API Channel
227229
void JoinNotify(ObjectGuid const& guid) const;
228230
void LeaveNotify(ObjectGuid const& guid) const;
229231
void SetOwnership(bool ownership) { _ownershipEnabled = ownership; }
232+
void SendMemberCount(Player const* player) const;
233+
void VoiceOn(Player const* player);
234+
void VoiceOff(Player const* player);
230235

231236
private:
232237
template <class Builder>

‎src/server/game/Chat/Hyperlinks.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ struct LinkValidator<LinkTags::quest>
176176
if (text.empty())
177177
return false;
178178

179-
if (text == data.Quest->GetTitle())
179+
if (text == data.Quest->GetLogTitle())
180180
return true;
181181

182182
QuestLocale const* locale = sObjectMgr->GetQuestLocale(data.Quest->GetQuestId());
@@ -188,7 +188,7 @@ struct LinkValidator<LinkTags::quest>
188188
if (i == DEFAULT_LOCALE)
189189
continue;
190190

191-
std::string_view name = ObjectMgr::GetLocaleString(locale->Title, LocaleConstant(i));
191+
std::string_view name = ObjectMgr::GetLocaleString(locale->LogTitle, LocaleConstant(i));
192192
if (!name.empty() && (text == name))
193193
return true;
194194
}

‎src/server/game/Conditions/DisableMgr.cpp‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ namespace DisableMgr
3434

3535
namespace
3636
{
37+
constexpr std::string_view MapTypeNames[] =
38+
{
39+
"World",
40+
"Dungeon",
41+
"Raid",
42+
"Battleground",
43+
"Arena"
44+
};
45+
3746
struct DisableData
3847
{
3948
uint16 flags;
@@ -208,28 +217,18 @@ void LoadDisables()
208217
{
209218
case MAP_COMMON:
210219
if (flags & VMAP::VMAP_DISABLE_AREAFLAG)
211-
TC_LOG_INFO("misc", "Areaflag disabled for world map {}.", entry);
220+
TC_LOG_INFO("misc", "Areaflag disabled for {} map {}.", MapTypeNames[mapEntry->InstanceType], entry);
212221
if (flags & VMAP::VMAP_DISABLE_LIQUIDSTATUS)
213-
TC_LOG_INFO("misc", "Liquid status disabled for world map {}.", entry);
222+
TC_LOG_INFO("misc", "Liquid status disabled for {} map {}.", MapTypeNames[mapEntry->InstanceType], entry);
214223
break;
215224
case MAP_INSTANCE:
216225
case MAP_RAID:
217-
if (flags & VMAP::VMAP_DISABLE_HEIGHT)
218-
TC_LOG_INFO("misc", "Height disabled for instance map {}.", entry);
219-
if (flags & VMAP::VMAP_DISABLE_LOS)
220-
TC_LOG_INFO("misc", "LoS disabled for instance map {}.", entry);
221-
break;
222226
case MAP_BATTLEGROUND:
223-
if (flags & VMAP::VMAP_DISABLE_HEIGHT)
224-
TC_LOG_INFO("misc", "Height disabled for battleground map {}.", entry);
225-
if (flags & VMAP::VMAP_DISABLE_LOS)
226-
TC_LOG_INFO("misc", "LoS disabled for battleground map {}.", entry);
227-
break;
228227
case MAP_ARENA:
229228
if (flags & VMAP::VMAP_DISABLE_HEIGHT)
230-
TC_LOG_INFO("misc", "Height disabled for arena map {}.", entry);
229+
TC_LOG_INFO("misc", "Height disabled for {} map {}.", MapTypeNames[mapEntry->InstanceType], entry);
231230
if (flags & VMAP::VMAP_DISABLE_LOS)
232-
TC_LOG_INFO("misc", "LoS disabled for arena map {}.", entry);
231+
TC_LOG_INFO("misc", "LoS disabled for {} map {}.", MapTypeNames[mapEntry->InstanceType], entry);
233232
break;
234233
default:
235234
break;
@@ -244,24 +243,8 @@ void LoadDisables()
244243
TC_LOG_ERROR("sql.sql", "Map entry {} from `disables` doesn't exist in dbc, skipped.", entry);
245244
continue;
246245
}
247-
switch (mapEntry->InstanceType)
248-
{
249-
case MAP_COMMON:
250-
TC_LOG_INFO("misc", "Pathfinding disabled for world map {}.", entry);
251-
break;
252-
case MAP_INSTANCE:
253-
case MAP_RAID:
254-
TC_LOG_INFO("misc", "Pathfinding disabled for instance map {}.", entry);
255-
break;
256-
case MAP_BATTLEGROUND:
257-
TC_LOG_INFO("misc", "Pathfinding disabled for battleground map {}.", entry);
258-
break;
259-
case MAP_ARENA:
260-
TC_LOG_INFO("misc", "Pathfinding disabled for arena map {}.", entry);
261-
break;
262-
default:
263-
break;
264-
}
246+
if (mapEntry->InstanceType <= std::ssize(MapTypeNames))
247+
TC_LOG_INFO("misc", "Pathfinding disabled for {} map {}.", MapTypeNames[mapEntry->InstanceType], entry);
265248
break;
266249
}
267250
default:

0 commit comments

Comments
 (0)