diff options
| author | ModoX <moardox@gmail.com> | 2025-02-02 00:42:51 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2025-02-04 16:23:26 +0100 |
| commit | 055268d23e9798945f6ade6c5d0a25c2707d8829 (patch) | |
| tree | 32fff39563c0453ec771a5142464046520f00e39 /src/server/game/Globals | |
| parent | 600b46bd3512850fec64bdfe75806f3f3c8674a3 (diff) | |
Core/Vehicle: Added RideSpellID field to override npc_spellclick_spells (#30198)
(cherry picked from commit 46251b56553b610588eea89b83b4b4e8b88e47da)
# Conflicts:
# sql/updates/world/cata_classic/2025_02_01_03_world.sql
Diffstat (limited to 'src/server/game/Globals')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 05cf9899c35..f46c7e18244 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -3200,8 +3200,8 @@ void ObjectMgr::LoadVehicleTemplateAccessories() uint32 count = 0; - // 0 1 2 3 4 5 - QueryResult result = WorldDatabase.Query("SELECT `entry`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer` FROM `vehicle_template_accessory`"); + // 0 1 2 3 4 5 6 + QueryResult result = WorldDatabase.Query("SELECT `entry`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer`, `RideSpellID` FROM `vehicle_template_accessory`"); if (!result) { @@ -3220,6 +3220,18 @@ void ObjectMgr::LoadVehicleTemplateAccessories() uint8 summonType = fields[4].GetUInt8(); uint32 summonTimer = fields[5].GetUInt32(); + Optional<uint32> rideSpellId; + if (!fields[6].IsNull()) + { + rideSpellId = fields[6].GetUInt32(); + + if (!sSpellMgr->GetSpellInfo(*rideSpellId, DIFFICULTY_NONE)) + { + TC_LOG_ERROR("sql.sql", "Table `vehicle_template_accessory`: rideSpellId {} does not exist for entry {}.", *rideSpellId, entry); + continue; + } + } + if (!GetCreatureTemplate(entry)) { TC_LOG_ERROR("sql.sql", "Table `vehicle_template_accessory`: creature template entry {} does not exist.", entry); @@ -3238,7 +3250,7 @@ void ObjectMgr::LoadVehicleTemplateAccessories() continue; } - _vehicleTemplateAccessoryStore[entry].push_back(VehicleAccessory(accessory, seatId, isMinion, summonType, summonTimer)); + _vehicleTemplateAccessoryStore[entry].push_back(VehicleAccessory(accessory, seatId, isMinion, summonType, summonTimer, rideSpellId)); ++count; } @@ -3290,8 +3302,8 @@ void ObjectMgr::LoadVehicleAccessories() uint32 count = 0; - // 0 1 2 3 4 5 - QueryResult result = WorldDatabase.Query("SELECT `guid`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer` FROM `vehicle_accessory`"); + // 0 1 2 3 4 5 6 + QueryResult result = WorldDatabase.Query("SELECT `guid`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer`, `RideSpellID` FROM `vehicle_accessory`"); if (!result) { @@ -3310,13 +3322,25 @@ void ObjectMgr::LoadVehicleAccessories() uint8 uiSummonType = fields[4].GetUInt8(); uint32 uiSummonTimer= fields[5].GetUInt32(); + Optional<uint32> rideSpellId; + if (!fields[6].IsNull()) + { + rideSpellId = fields[6].GetUInt32(); + + if (!sSpellMgr->GetSpellInfo(*rideSpellId, DIFFICULTY_NONE)) + { + TC_LOG_ERROR("sql.sql", "Table `vehicle_accessory`: rideSpellId {} does not exist for guid {}.", *rideSpellId, uiGUID); + continue; + } + } + if (!GetCreatureTemplate(uiAccessory)) { TC_LOG_ERROR("sql.sql", "Table `vehicle_accessory`: Accessory {} does not exist.", uiAccessory); continue; } - _vehicleAccessoryStore[uiGUID].push_back(VehicleAccessory(uiAccessory, uiSeat, bMinion, uiSummonType, uiSummonTimer)); + _vehicleAccessoryStore[uiGUID].push_back(VehicleAccessory(uiAccessory, uiSeat, bMinion, uiSummonType, uiSummonTimer, rideSpellId)); ++count; } |