From 0bdf7a6b0fc3da39469e7083e4069d111950f64e Mon Sep 17 00:00:00 2001 From: Nicolas Lebacq Date: Fri, 7 Nov 2025 06:47:12 +0000 Subject: [PATCH 1/3] =?UTF-8?q?fix(DB/Creature):=20Deleted=20Wendigo=20ent?= =?UTF-8?q?ity=20spawning=20under=20the=20ground=E2=80=A6=20(#23555)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/sql/updates/pending_db_world/rev_1762456793859479860.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1762456793859479860.sql diff --git a/data/sql/updates/pending_db_world/rev_1762456793859479860.sql b/data/sql/updates/pending_db_world/rev_1762456793859479860.sql new file mode 100644 index 000000000..7aec6decf --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1762456793859479860.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `creature` WHERE `guid` = 3564 AND `id1` = 1135; From 24ca7efb7389ca7d57b95d8112e92889f7fde878 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 7 Nov 2025 06:48:18 +0000 Subject: [PATCH 2/3] chore(DB): import pending files Referenced commit(s): 0bdf7a6b0fc3da39469e7083e4069d111950f64e --- .../rev_1762456793859479860.sql => db_world/2025_11_07_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1762456793859479860.sql => db_world/2025_11_07_00.sql} (59%) diff --git a/data/sql/updates/pending_db_world/rev_1762456793859479860.sql b/data/sql/updates/db_world/2025_11_07_00.sql similarity index 59% rename from data/sql/updates/pending_db_world/rev_1762456793859479860.sql rename to data/sql/updates/db_world/2025_11_07_00.sql index 7aec6decf..1e41d2b83 100644 --- a/data/sql/updates/pending_db_world/rev_1762456793859479860.sql +++ b/data/sql/updates/db_world/2025_11_07_00.sql @@ -1,2 +1,3 @@ +-- DB update 2025_11_06_01 -> 2025_11_07_00 -- DELETE FROM `creature` WHERE `guid` = 3564 AND `id1` = 1135; From 7ac7228315a54c2dc33118a6d443589adb20d8bb Mon Sep 17 00:00:00 2001 From: sogladev Date: Fri, 7 Nov 2025 12:07:57 +0100 Subject: [PATCH 3/3] fix(Core/Player): simultaneously swap melee and ranged weapon in combat (#23557) --- src/server/game/Entities/Player/PlayerStorage.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index 6e0b19249..80f6a068e 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -1848,8 +1848,13 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16& dest, Item* pItem, bool return EQUIP_ERR_NOT_DURING_ARENA_MATCH; } - if (IsInCombat() && (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC) && m_weaponChangeTimer != 0) - return EQUIP_ERR_CANT_DO_RIGHT_NOW; // maybe exist better err + if (IsInCombat() && (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC)) + { + uint32 cooldownSpell = IsClass(CLASS_ROGUE, CLASS_CONTEXT_WEAPON_SWAP) ? 6123 : 6119; + uint32 startRecoveryTime = sSpellMgr->GetSpellInfo(cooldownSpell)->StartRecoveryTime; + if (m_weaponChangeTimer != 0 && m_weaponChangeTimer != startRecoveryTime) + return EQUIP_ERR_CANT_DO_RIGHT_NOW; // maybe exist better err + } if (IsNonMeleeSpellCast(false)) return EQUIP_ERR_CANT_DO_RIGHT_NOW;