diff options
| -rw-r--r-- | data/sql/updates/db_world/2025_11_03_00.sql (renamed from data/sql/updates/pending_db_world/rev_1760824970973012794.sql) | 1 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_03_01.sql | 7 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_04_00.sql | 106 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_04_01.sql | 3 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/PlayerUpdates.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
6 files changed, 121 insertions, 3 deletions
diff --git a/data/sql/updates/pending_db_world/rev_1760824970973012794.sql b/data/sql/updates/db_world/2025_11_03_00.sql index ebc07bc115..76ea5c36ab 100644 --- a/data/sql/updates/pending_db_world/rev_1760824970973012794.sql +++ b/data/sql/updates/db_world/2025_11_03_00.sql @@ -1,3 +1,4 @@ +-- DB update 2025_11_01_03 -> 2025_11_03_00 -- DELETE FROM `spelldifficulty_dbc` WHERE `ID` IN (53618, 53616, 53617, 53602); INSERT INTO `spelldifficulty_dbc` (`ID`, `DifficultySpellID_1`, `DifficultySpellID_2`, `DifficultySpellID_3`, `DifficultySpellID_4`) VALUES diff --git a/data/sql/updates/db_world/2025_11_03_01.sql b/data/sql/updates/db_world/2025_11_03_01.sql new file mode 100644 index 0000000000..4b83f2b5f9 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_03_01.sql @@ -0,0 +1,7 @@ +-- DB update 2025_11_03_00 -> 2025_11_03_01 + +DELETE FROM `areatrigger_scripts` WHERE `entry` = 5338; + +DELETE FROM `areatrigger_teleport` WHERE `ID` = 5338; +INSERT INTO `areatrigger_teleport` (`ID`, `Name`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES +(5338, 'Naxxanar Top -> Down', 571, 3733.68, 3563.25, 290.812, 3.66519); diff --git a/data/sql/updates/db_world/2025_11_04_00.sql b/data/sql/updates/db_world/2025_11_04_00.sql new file mode 100644 index 0000000000..1d10d9d6d9 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_04_00.sql @@ -0,0 +1,106 @@ +-- DB update 2025_11_03_01 -> 2025_11_04_00 +-- fix appearances of newly added 'Winter Reveler's +-- assign correct model to creature 15792 `Troll Male Winter Reveler` used by spell 26252 `Winter Reveler - Troll Male` +UPDATE `creature_template_model` SET `CreatureDisplayID` = 18809, `VerifiedBuild` = 0 WHERE (`CreatureID` = 15792) AND (`Idx` = 0); + +-- assign costume auras +DELETE FROM `creature_addon` WHERE (`guid` BETWEEN 66801 AND 66898); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(66801, 0, 0, 0, 1, 0, 0, '26247'), -- Orc Female +(66802, 0, 0, 0, 1, 0, 0, '26248'), -- Orc Male +(66803, 0, 0, 0, 1, 0, 0, '26247'), -- Orc Female +(66804, 0, 0, 0, 1, 0, 0, '26248'), -- Orc Male +(66805, 0, 0, 0, 1, 0, 0, '26239'), -- Human Male +(66806, 0, 0, 0, 1, 0, 0, '26240'), -- Human Female +(66807, 0, 0, 0, 1, 0, 0, '26239'), -- Human Male +(66808, 0, 0, 0, 1, 0, 0, '26240'), -- Human Female +(66809, 0, 0, 0, 1, 0, 0, '26251'), -- Troll Female +(66810, 0, 0, 0, 1, 0, 0, '26252'), -- Troll Male +(66811, 0, 0, 0, 1, 0, 0, '26249'), -- Tauren Female +(66812, 0, 0, 0, 1, 0, 0, '26250'), -- Tauren Male +(66813, 0, 0, 0, 1, 0, 0, '26241'), -- Dwarf Male +(66814, 0, 0, 0, 1, 0, 0, '26242'), -- Dwarf Female +(66815, 0, 0, 0, 1, 0, 0, '26253'), -- Undead Female +(66816, 0, 0, 0, 1, 0, 0, '26254'), -- Undead Male +(66817, 0, 0, 0, 1, 0, 0, '26243'), -- Goblin Female +(66818, 0, 0, 0, 1, 0, 0, '26244'), -- Goblin Male +(66819, 0, 0, 0, 1, 0, 0, '26249'), -- Tauren Female +(66820, 0, 0, 0, 1, 0, 0, '26250'), -- Tauren Male +(66821, 0, 0, 0, 1, 0, 0, '26249'), -- Tauren Female +(66822, 0, 0, 0, 1, 0, 0, '26250'), -- Tauren Male +(66823, 0, 0, 0, 1, 0, 0, '26239'), -- Human Male +(66824, 0, 0, 0, 1, 0, 0, '26240'), -- Human Female +(66825, 0, 0, 0, 1, 0, 0, '26245'), -- Night Elf Female +(66826, 0, 0, 0, 1, 0, 0, '26246'), -- Night Elf Male +(66827, 0, 0, 0, 1, 0, 0, '26249'), -- Tauren Female +(66828, 0, 0, 0, 1, 0, 0, '26250'), -- Tauren Male +(66829, 0, 0, 0, 1, 0, 0, '26249'), -- Tauren Female +(66830, 0, 0, 0, 1, 0, 0, '26250'), -- Tauren Male +(66831, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66832, 0, 0, 0, 1, 0, 0, '39861'), -- Blood Elf Male +(66833, 0, 0, 0, 1, 0, 0, '26243'), -- Goblin Female +(66834, 0, 0, 0, 1, 0, 0, '26244'), -- Goblin Male +(66835, 0, 0, 0, 1, 0, 0, '26245'), -- Night Elf Female +(66836, 0, 0, 0, 1, 0, 0, '26246'), -- Night Elf Male +(66837, 0, 0, 0, 1, 0, 0, '26247'), -- Orc Female +(66838, 0, 0, 0, 1, 0, 0, '26248'), -- Orc Male +(66839, 0, 0, 0, 1, 0, 0, '26245'), -- Night Elf Female +(66840, 0, 0, 0, 1, 0, 0, '26246'), -- Night Elf Male +(66841, 0, 0, 0, 1, 0, 0, '26245'), -- Night Elf Female +(66842, 0, 0, 0, 1, 0, 0, '26246'), -- Night Elf Male +(66843, 0, 0, 0, 1, 0, 0, '26245'), -- Night Elf Female +(66844, 0, 0, 0, 1, 0, 0, '26246'), -- Night Elf Male +(66845, 0, 0, 0, 1, 0, 0, '26243'), -- Goblin Female +(66846, 0, 0, 0, 1, 0, 0, '26244'), -- Goblin Male +(66847, 0, 0, 0, 1, 0, 0, '26247'), -- Orc Female +(66848, 0, 0, 0, 1, 0, 0, '26248'), -- Orc Male +(66849, 0, 0, 0, 1, 0, 0, '39858'), -- Draenei Female +(66850, 0, 0, 0, 1, 0, 0, '39859'), -- Draenei Male +(66851, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66852, 0, 0, 0, 1, 0, 0, '39861'), -- Blood Elf Male +(66853, 0, 0, 0, 1, 0, 0, '26247'), -- Orc Female +(66854, 0, 0, 0, 1, 0, 0, '26248'), -- Orc Male +(66855, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66856, 0, 0, 0, 1, 0, 0, '39861'), -- Blood Elf Male +(66857, 0, 0, 0, 1, 0, 0, '26247'), -- Orc Female +(66858, 0, 0, 0, 1, 0, 0, '26248'), -- Orc Male +(66859, 0, 0, 0, 1, 0, 0, '39858'), -- Draenei Female +(66860, 0, 0, 0, 1, 0, 0, '39859'), -- Draenei Male +(66861, 0, 0, 0, 1, 0, 0, '39858'), -- Draenei Female +(66862, 0, 0, 0, 1, 0, 0, '39859'), -- Draenei Male +(66863, 0, 0, 0, 1, 0, 0, '26241'), -- Dwarf Male +(66864, 0, 0, 0, 1, 0, 0, '26242'), -- Dwarf Female +(66865, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66866, 0, 0, 0, 1, 0, 0, '39861'), -- Blood Elf Male +(66867, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66868, 0, 0, 0, 1, 0, 0, '39861'), -- Blood Elf Male +(66869, 0, 0, 0, 1, 0, 0, '26239'), -- Human Male +(66870, 0, 0, 0, 1, 0, 0, '26240'), -- Human Female +(66871, 0, 0, 0, 1, 0, 0, '39858'), -- Draenei Female +(66872, 0, 0, 0, 1, 0, 0, '39859'), -- Draenei Male +(66873, 0, 0, 0, 1, 0, 0, '26253'), -- Undead Female +(66874, 0, 0, 0, 1, 0, 0, '26254'), -- Undead Male +(66875, 0, 0, 0, 1, 0, 0, '39876'), -- Gnome Female +(66876, 0, 0, 0, 1, 0, 0, '39877'), -- Gnome Male +(66877, 0, 0, 0, 1, 0, 0, '26245'), -- Night Elf Female +(66878, 0, 0, 0, 1, 0, 0, '26246'), -- Night Elf Male +(66879, 0, 0, 0, 1, 0, 0, '26251'), -- Troll Female +(66880, 0, 0, 0, 1, 0, 0, '26252'), -- Troll Male +(66881, 0, 0, 0, 1, 0, 0, '39858'), -- Draenei Female +(66882, 0, 0, 0, 1, 0, 0, '39859'), -- Draenei Male +(66883, 0, 0, 0, 1, 0, 0, '26247'), -- Orc Female +(66884, 0, 0, 0, 1, 0, 0, '26248'), -- Orc Male +(66885, 0, 0, 0, 1, 0, 0, '39858'), -- Draenei Female +(66886, 0, 0, 0, 1, 0, 0, '39859'), -- Draenei Male +(66887, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66888, 0, 0, 0, 1, 0, 0, '39861'), -- Blood Elf Male +(66889, 0, 0, 0, 1, 0, 0, '26243'), -- Goblin Female +(66890, 0, 0, 0, 1, 0, 0, '26244'), -- Goblin Male +(66891, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66892, 0, 0, 0, 1, 0, 0, '39861'), -- Blood Elf Male +(66893, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66894, 0, 0, 0, 1, 0, 0, '39861'), -- Blood Elf Male +(66895, 0, 0, 0, 1, 0, 0, '26239'), -- Human Male +(66896, 0, 0, 0, 1, 0, 0, '26240'), -- Human Female +(66897, 0, 0, 0, 1, 0, 0, '39860'), -- Blood Elf Female +(66898, 0, 0, 0, 1, 0, 0, '39861'); -- Blood Elf Male diff --git a/data/sql/updates/db_world/2025_11_04_01.sql b/data/sql/updates/db_world/2025_11_04_01.sql new file mode 100644 index 0000000000..8780751f3e --- /dev/null +++ b/data/sql/updates/db_world/2025_11_04_01.sql @@ -0,0 +1,3 @@ +-- DB update 2025_11_04_00 -> 2025_11_04_01 +-- fix z position of some 195164 'Pumpkin' spawns +UPDATE `gameobject` SET `position_z` = (`position_z` + 0.7), `VerifiedBuild` = 0 WHERE (`id` = 195164) AND (`guid` IN (18978, 18979, 18980, 18981, 18982, 18983, 18984, 18985, 18986, 18987, 19018, 19019, 19020, 19021, 19022, 19023, 19024, 19025, 19026, 19027, 19115, 19116, 19117, 19118, 19119, 19120, 19121, 19122, 19123, 19124, 19151, 19152, 19153, 19154, 19155, 19156, 19157, 19158, 19159, 19160, 19304, 19305, 19306, 19307, 19308, 19309, 19310, 19311, 19312, 19313)); diff --git a/src/server/game/Entities/Player/PlayerUpdates.cpp b/src/server/game/Entities/Player/PlayerUpdates.cpp index 58bb54ad56..df5153a1cb 100644 --- a/src/server/game/Entities/Player/PlayerUpdates.cpp +++ b/src/server/game/Entities/Player/PlayerUpdates.cpp @@ -1968,10 +1968,7 @@ void Player::UpdateCharmedAI() Unit* target = GetVictim(); if (target) - { SetInFront(target); - SendMovementFlagUpdate(true); - } if (HasUnitState(UNIT_STATE_CASTING)) return; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index ed907d951d..cf1bb05206 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10963,7 +10963,11 @@ void Unit::SetCharm(Unit* charm, bool apply) charm->SetUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); } else + { charm->m_ControlledByPlayer = false; + if (!HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) + charm->RemoveUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); + } // PvP, FFAPvP charm->SetByteValue(UNIT_FIELD_BYTES_2, 1, GetByteValue(UNIT_FIELD_BYTES_2, 1)); |