From 0a376bdc764f9be7784a58858c03166a775fbf05 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sat, 27 Apr 2024 01:56:46 +0200 Subject: [PATCH 1/8] fix(Core/GameObject): load guid based scripts correctly (#18811) - m_goData must be assigned before Create() is beeing called - otherwise GetScriptId() can't load the correct scriptiD in Create() - all in all this is now more in line with how it's beeing done in Creature.cpp --- src/server/game/Entities/GameObject/GameObject.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 83f21ac4c..0db064434 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -406,7 +406,7 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u } } - LastUsedScriptID = GetGOInfo()->ScriptId; + LastUsedScriptID = GetScriptId(); AIM_Initialize(); if (uint32 linkedEntry = GetGOInfo()->GetLinkedGameObjectEntry()) @@ -1140,6 +1140,7 @@ bool GameObject::LoadGameObjectFromDB(ObjectGuid::LowType spawnId, Map* map, boo GOState go_state = data->go_state; uint32 artKit = data->artKit; + m_goData = data; m_spawnId = spawnId; if (!Create(map->GenerateLowGuid(), entry, map, phaseMask, x, y, z, ang, data->rotation, animprogress, go_state, artKit)) @@ -1175,8 +1176,6 @@ bool GameObject::LoadGameObjectFromDB(ObjectGuid::LowType spawnId, Map* map, boo m_respawnTime = 0; } - m_goData = data; - if (addToMap && !GetMap()->AddToMap(this)) return false; From 565b55472ad052e68c970c2e19d2ad8fe756e7f1 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sat, 27 Apr 2024 11:15:47 +0200 Subject: [PATCH 2/8] fix(DB/Gameobject): Sniffed Values for 'AuctionNode' spawns (#18780) --- .../updates/pending_db_world/rev_1713790630268201700.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713790630268201700.sql diff --git a/data/sql/updates/pending_db_world/rev_1713790630268201700.sql b/data/sql/updates/pending_db_world/rev_1713790630268201700.sql new file mode 100644 index 000000000..e87db06b8 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713790630268201700.sql @@ -0,0 +1,6 @@ +-- Update gameobject 'AuctionNode' with sniffed values +-- new spawns +DELETE FROM `gameobject` WHERE (`id` IN (152583)) +AND (`guid` IN (24)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(24, 152583, 1, 0, 0, 1, 1, -1257.8424072265625, 24.41799354553222656, 128.217498779296875, 2.888511419296264648, 0, 0, 0.99200439453125, 0.126203224062919616, 120, 255, 1, "", 50250, NULL); From 9df0c08702d2969eeedb0d9efecca9aba509ed62 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 27 Apr 2024 09:16:38 +0000 Subject: [PATCH 3/8] chore(DB): import pending files Referenced commit(s): 565b55472ad052e68c970c2e19d2ad8fe756e7f1 --- .../rev_1713790630268201700.sql => db_world/2024_04_27_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1713790630268201700.sql => db_world/2024_04_27_00.sql} (93%) diff --git a/data/sql/updates/pending_db_world/rev_1713790630268201700.sql b/data/sql/updates/db_world/2024_04_27_00.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1713790630268201700.sql rename to data/sql/updates/db_world/2024_04_27_00.sql index e87db06b8..288cdfa18 100644 --- a/data/sql/updates/pending_db_world/rev_1713790630268201700.sql +++ b/data/sql/updates/db_world/2024_04_27_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_25_01 -> 2024_04_27_00 -- Update gameobject 'AuctionNode' with sniffed values -- new spawns DELETE FROM `gameobject` WHERE (`id` IN (152583)) From 7a2f6ff8e5b6d693bd3f6790d017757a3cd95c05 Mon Sep 17 00:00:00 2001 From: Balleny <12682004+balleny@users.noreply.github.com> Date: Sat, 27 Apr 2024 11:17:11 +0200 Subject: [PATCH 4/8] fix(Core/Battleground): EOTS adjust flag respawn timer (#18759) adjust flag respawn timer --- src/server/game/Battlegrounds/Zones/BattlegroundEY.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index a20132c0b..ed104de46 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -33,7 +33,7 @@ enum BG_EY_Events enum BG_EY_Timers { - BG_EY_FLAG_RESPAWN_TIME = 20 * IN_MILLISECONDS, + BG_EY_FLAG_RESPAWN_TIME = 10 * IN_MILLISECONDS, BG_EY_FLAG_ON_GROUND_TIME = 10 * IN_MILLISECONDS, BG_EY_FPOINTS_CHECK_TIME = 2 * IN_MILLISECONDS, BG_EY_FPOINTS_TICK_TIME = 1 * IN_MILLISECONDS From 81280cd560fbb87f15a7a646330ae5c3e3fdf419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=B9=BF?= <18535853+PkllonG@users.noreply.github.com> Date: Sat, 27 Apr 2024 17:17:38 +0800 Subject: [PATCH 5/8] refactor(Scripts/Karazhan): 'uint' It can never be less than 0 (#18726) Update boss_chess_event.cpp --- .../scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp index 564c6a75d..c74f4e088 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp @@ -467,7 +467,7 @@ struct npc_echo_of_medivh : public ScriptedAI break; } - if (newRow < MAX_ROW && newCol < MAX_COL && newRow >= 0 && newCol >= 0) + if (newRow < MAX_ROW && newCol < MAX_COL) if (Creature* targetPiece = ObjectAccessor::GetCreature(*me, _boards[newRow][newCol].pieceGUID)) if (!IsFriendly(piece, targetPiece)) return targetPiece; From f203b1b9dc7da81f785e3028c5cf9f5948584761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=B9=BF?= <18535853+PkllonG@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:31:14 +0800 Subject: [PATCH 6/8] fix(Scripts/PlayerScript): PlayerScript Error (#18806) Update PlayerScript.cpp --- src/server/game/Scripting/ScriptDefines/PlayerScript.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp index 67e9598ed..633750fdd 100644 --- a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp @@ -136,7 +136,7 @@ void ScriptMgr::OnPlayerReputationRankChange(Player* player, uint32 factionID, R void ScriptMgr::OnPlayerLearnSpell(Player* player, uint32 spellID) { - CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_PLAYER_LEARN_TALENTS, script->OnLearnSpell(player, spellID)); + CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_LEARN_SPELL, script->OnLearnSpell(player, spellID)); } void ScriptMgr::OnPlayerForgotSpell(Player* player, uint32 spellID) @@ -211,7 +211,7 @@ void ScriptMgr::OnBeforePlayerUpdate(Player* player, uint32 p_time) void ScriptMgr::OnPlayerUpdate(Player* player, uint32 p_time) { - CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_BEFORE_UPDATE, script->OnUpdate(player, p_time)); + CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_UPDATE, script->OnUpdate(player, p_time)); } void ScriptMgr::OnPlayerLogin(Player* player) From 58f1cffb10f069c1d8e44833707e1ab2f3090b07 Mon Sep 17 00:00:00 2001 From: Aloy <44802344+V-Cyberpunk@users.noreply.github.com> Date: Mon, 29 Apr 2024 08:17:54 +0200 Subject: [PATCH 7/8] fix(DB/Gossip_Menu_Option_Locale): fix german umlauts (#18781) * fix(DB/Gossip_Menu_Option_Locale): fix german umlauts * new line added * Specify German language in the query --------- Co-authored-by: Pagani Walter --- .../updates/pending_db_world/rev_1713803843196763300.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1713803843196763300.sql diff --git a/data/sql/updates/pending_db_world/rev_1713803843196763300.sql b/data/sql/updates/pending_db_world/rev_1713803843196763300.sql new file mode 100644 index 000000000..e5678a73d --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1713803843196763300.sql @@ -0,0 +1,6 @@ +UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ä','ä') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ü','ü') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ö','ö') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `BoxText`=REPLACE(`BoxText`,'ä','ä') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `BoxText`=REPLACE(`BoxText`,'ü','ü') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `BoxText`=REPLACE(`BoxText`,'ö','ö') WHERE `Locale`='deDE'; From c57521be0e71379c1c6247b7bc83f9beac50b095 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 29 Apr 2024 06:18:47 +0000 Subject: [PATCH 8/8] chore(DB): import pending files Referenced commit(s): 58f1cffb10f069c1d8e44833707e1ab2f3090b07 --- .../rev_1713803843196763300.sql => db_world/2024_04_29_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1713803843196763300.sql => db_world/2024_04_29_00.sql} (93%) diff --git a/data/sql/updates/pending_db_world/rev_1713803843196763300.sql b/data/sql/updates/db_world/2024_04_29_00.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1713803843196763300.sql rename to data/sql/updates/db_world/2024_04_29_00.sql index e5678a73d..27a5e333c 100644 --- a/data/sql/updates/pending_db_world/rev_1713803843196763300.sql +++ b/data/sql/updates/db_world/2024_04_29_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_27_00 -> 2024_04_29_00 UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ä','ä') WHERE `Locale`='deDE'; UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ü','ü') WHERE `Locale`='deDE'; UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ö','ö') WHERE `Locale`='deDE';