Merge 3.3.5 to 3.3.5-base_patch

Github Actions · Github Actions · commit 077d7facbbe0 · 2024-08-12T01:27:30.000Z
diff --git a/sql/updates/world/3.3.5/2024_08_11_00_world.sql b/sql/updates/world/3.3.5/2024_08_11_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `target_type`=8 WHERE `entryorguid`=2711500 AND `source_type`=9 AND `id`=3 AND `link`=0;
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp
@@ -465,7 +465,7 @@ void WorldSession::HandleCalendarEventInvite(WorldPackets::Calendar::CalendarInv
             return;
         }
 
-        GetQueryProcessor().AddCallback(CharacterDatabase.AsyncQuery(Trinity::StringFormat("SELECT 1 FROM character_social WHERE guid = {} AND friend = {} AND (cs.flags & {}) <> 0",
+        GetQueryProcessor().AddCallback(CharacterDatabase.AsyncQuery(Trinity::StringFormat("SELECT 1 FROM character_social WHERE guid = {} AND friend = {} AND (flags & {}) <> 0",
             characterInfo->Guid.GetCounter(), playerGuid.GetCounter(), SOCIAL_FLAG_IGNORED).c_str()))
             .WithCallback([inviteeGuid = characterInfo->Guid, inviteeTeam = Player::TeamForRace(characterInfo->Race), inviteeGuildId = characterInfo->GuildId, continuation = std::move(createInvite)](QueryResult result)
         {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--`
	`2`	+UPDATE `smart_scripts` SET `target_type`=8 WHERE `entryorguid`=2711500 AND `source_type`=9 AND `id`=3 AND `link`=0;
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ void WorldSession::HandleCalendarEventInvite(WorldPackets::Calendar::CalendarInv`
`465`	`465`	`return;`
`466`	`466`	`}`
`467`	`467`
`468`		`- GetQueryProcessor().AddCallback(CharacterDatabase.AsyncQuery(Trinity::StringFormat("SELECT 1 FROM character_social WHERE guid = {} AND friend = {} AND (cs.flags & {}) <> 0",`
	`468`	`+ GetQueryProcessor().AddCallback(CharacterDatabase.AsyncQuery(Trinity::StringFormat("SELECT 1 FROM character_social WHERE guid = {} AND friend = {} AND (flags & {}) <> 0",`
`469`	`469`	`characterInfo->Guid.GetCounter(), playerGuid.GetCounter(), SOCIAL_FLAG_IGNORED).c_str()))`
`470`	`470`	`.WithCallback([inviteeGuid = characterInfo->Guid, inviteeTeam = Player::TeamForRace(characterInfo->Race), inviteeGuildId = characterInfo->GuildId, continuation = std::move(createInvite)](QueryResult result)`
`471`	`471`	`{`