Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update 11.03.24 #348

Merged
merged 3 commits into from
Nov 3, 2024
Merged

Update 11.03.24 #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
315369e
Core: Updated allowed build to 11.0.5.57388
Shauren Nov 1, 2024
05c8ad2
Core/Texts: Fix nullptr when no BroadcastText is found
Golrag Nov 1, 2024
0435f22
Core/PacketIO: Fixed SMSG_UPDATE_OBJECT fragment changes mask initial…
Shauren Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions sql/base/auth_database.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,14 @@ INSERT INTO `build_auth_key` VALUES
(57292,'Mac','x64','WoWC',0xE59F7530C7BFF77CB62E62D4E6D3EEC8),
(57292,'Win','A64','WoW',0xF42B862D0559CCD3204B2DF58E995761),
(57292,'Win','x64','WoW',0xED8353327D5538F75FAF2E0C584D2EF3),
(57292,'Win','x64','WoWC',0x67FC9D56CC96C6F4ACE29151375962F4);
(57292,'Win','x64','WoWC',0x67FC9D56CC96C6F4ACE29151375962F4),
(57388,'Mac','A64','WoW',0xFA9D6F044063948AB74FB3FDE335C0D5),
(57388,'Mac','A64','WoWC',0x3962974506F57EF33BBBD4C904A82157),
(57388,'Mac','x64','WoW',0xE7E3432357BC634EBD7B76BA40D51FD2),
(57388,'Mac','x64','WoWC',0xBFFDD44D892A2143B61BB59E448E348C),
(57388,'Win','A64','WoW',0x92129DE92D2BA5F67581C5DE642B1289),
(57388,'Win','x64','WoW',0x16F9CB724C662E3E8029A442443C6305),
(57388,'Win','x64','WoWC',0xDFD9BFFD00FBEFECBF0AEF0FFC9E8F2D);
/*!40000 ALTER TABLE `build_auth_key` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down Expand Up @@ -1188,7 +1195,8 @@ INSERT INTO `build_info` VALUES
(56819,11,0,2,NULL),
(57171,11,0,5,NULL),
(57212,11,0,5,NULL),
(57292,11,0,5,NULL);
(57292,11,0,5,NULL),
(57388,11,0,5,NULL);
/*!40000 ALTER TABLE `build_info` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down Expand Up @@ -2798,7 +2806,7 @@ CREATE TABLE `realmlist` (
`timezone` tinyint unsigned NOT NULL DEFAULT '0',
`allowedSecurityLevel` tinyint unsigned NOT NULL DEFAULT '0',
`population` float NOT NULL DEFAULT '0',
`gamebuild` int unsigned NOT NULL DEFAULT '57292',
`gamebuild` int unsigned NOT NULL DEFAULT '57388',
`Region` tinyint unsigned NOT NULL DEFAULT '1',
`Battlegroup` tinyint unsigned NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
Expand All @@ -2813,7 +2821,7 @@ CREATE TABLE `realmlist` (
LOCK TABLES `realmlist` WRITE;
/*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
INSERT INTO `realmlist` VALUES
(1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,0,1,0,0,57292,1,1);
(1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,0,1,0,0,57388,1,1);
/*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down Expand Up @@ -3278,7 +3286,8 @@ INSERT INTO `updates` VALUES
('2024_10_01_00_auth.sql','665EC51B03F52C373F713D96A1426054D7DF98C8','RELEASED','2024-10-01 23:39:44',0),
('2024_10_23_00_auth.sql','78203AE9051E866F103CC7B8A6EE09D5C25BCB9A','RELEASED','2024-10-23 15:48:13',0),
('2024_10_23_01_auth.sql','06257BB5FF23564549529C14822DD5780AA7F7C3','RELEASED','2024-10-23 22:30:54',0),
('2024_10_30_00_auth.sql','B4C930B0CE499704CEBF208A71871061DC27008C','RELEASED','2024-10-30 13:04:40',0);
('2024_10_30_00_auth.sql','B4C930B0CE499704CEBF208A71871061DC27008C','RELEASED','2024-10-30 13:04:40',0),
('2024_11_01_00_auth.sql','62EF7FC9CD2DCD8D24CE1BCED3BF9E2917B6674B','RELEASED','2024-11-01 13:26:56',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down
23 changes: 23 additions & 0 deletions sql/updates/auth/master/2024_11_01_00_auth.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
DELETE FROM `build_info` WHERE `build` IN (57388);
INSERT INTO `build_info` (`build`,`majorVersion`,`minorVersion`,`bugfixVersion`,`hotfixVersion`) VALUES
(57388,11,0,5,NULL);

DELETE FROM `build_auth_key` WHERE `build`=57388 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoW';
DELETE FROM `build_auth_key` WHERE `build`=57388 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoWC';
DELETE FROM `build_auth_key` WHERE `build`=57388 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoW';
DELETE FROM `build_auth_key` WHERE `build`=57388 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoWC';
DELETE FROM `build_auth_key` WHERE `build`=57388 AND `platform`='Win' AND `arch`='A64' AND `type`='WoW';
DELETE FROM `build_auth_key` WHERE `build`=57388 AND `platform`='Win' AND `arch`='x64' AND `type`='WoW';
DELETE FROM `build_auth_key` WHERE `build`=57388 AND `platform`='Win' AND `arch`='x64' AND `type`='WoWC';
INSERT INTO `build_auth_key` (`build`,`platform`,`arch`,`type`,`key`) VALUES
(57388,'Mac','A64','WoW',0xFA9D6F044063948AB74FB3FDE335C0D5),
(57388,'Mac','A64','WoWC',0x3962974506F57EF33BBBD4C904A82157),
(57388,'Mac','x64','WoW',0xE7E3432357BC634EBD7B76BA40D51FD2),
(57388,'Mac','x64','WoWC',0xBFFDD44D892A2143B61BB59E448E348C),
(57388,'Win','A64','WoW',0x92129DE92D2BA5F67581C5DE642B1289),
(57388,'Win','x64','WoW',0x16F9CB724C662E3E8029A442443C6305),
(57388,'Win','x64','WoWC',0xDFD9BFFD00FBEFECBF0AEF0FFC9E8F2D);

UPDATE `realmlist` SET `gamebuild`=57388 WHERE `gamebuild`=57292;

ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int unsigned NOT NULL DEFAULT '57388';
3 changes: 3 additions & 0 deletions src/server/game/Entities/Object/Updates/WowCSEntityDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ void EntityFragmentsHolder::Add(EntityFragment fragment, bool update)
{
UpdateableMasks[i] = 1 << maskIndex++;
if (IsIndirectFragment(UpdateableIds[i]))
{
ContentsChangedMask |= UpdateableMasks[i]; // set the first bit to true to activate fragment
UpdateableMasks[i] |= 1 << maskIndex++;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Entities/Object/Updates/WowCSEntityDefinitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ struct EntityFragmentsHolder
std::array<EntityFragment, 2> UpdateableIds = { EntityFragment::End, EntityFragment::End };
std::array<uint8, 2> UpdateableMasks = { };
uint8 UpdateableCount = 0;
uint8 ContentsChangedMask = CGObjectActiveMask;
uint8 ContentsChangedMask = 0;

void Add(EntityFragment fragment, bool update);
void Remove(EntityFragment fragment);
Expand Down
4 changes: 2 additions & 2 deletions src/server/game/Texts/CreatureTextMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,12 @@ uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, WorldObject

if (srcPlr)
{
Trinity::CreatureTextTextBuilder builder(source, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget, iter->BroadcastTextId, iter->emote, finalSound, finalPlayType, bct->ConditionID);
Trinity::CreatureTextTextBuilder builder(source, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget, iter->BroadcastTextId, iter->emote, finalSound, finalPlayType, bct ? bct->ConditionID : 0);
SendChatPacket(finalSource, builder, finalType, whisperTarget, range, team, gmOnly);
}
else
{
Trinity::CreatureTextTextBuilder builder(finalSource, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget, iter->BroadcastTextId, iter->emote, finalSound, finalPlayType, bct->ConditionID);
Trinity::CreatureTextTextBuilder builder(finalSource, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget, iter->BroadcastTextId, iter->emote, finalSound, finalPlayType, bct ? bct->ConditionID : 0);
SendChatPacket(finalSource, builder, finalType, whisperTarget, range, team, gmOnly);
}

Expand Down
Loading