Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Vehicle: Added RideSpellID field to override npc_spellclick_spells

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/46251b56553b610588eea89b83b4b4e8b88e47da)
This commit is contained in:
Hondacrx
2025-06-08 18:18:22 -04:00
parent fe4781722f
commit af8a76387c
3 changed files with 139 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Globals/ObjectManager.cs
+30 -6
View File
@@ -11404,8 +11404,8 @@ namespace Game
uint count = 0;
// 0 1 2 3 4 5
SQLResult result = DB.World.Query("SELECT `entry`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer` FROM `vehicle_template_accessory`");
// 0 1 2 3 4 5 6
SQLResult result = DB.World.Query("SELECT `entry`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer`, `RideSpellID` FROM `vehicle_template_accessory`");
if (result.IsEmpty())
{
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 vehicle template accessories. DB table `vehicle_template_accessory` is empty.");
@@ -11421,6 +11421,18 @@ namespace Game
byte summonType = result.Read<byte>(4);
uint summonTimer = result.Read<uint>(5);
uint? rideSpellId = null;
if (!result.IsNull(6))
{
rideSpellId = result.Read<uint>(6);
if (!Global.SpellMgr.HasSpellInfo(rideSpellId.Value, Difficulty.None))
{
Log.outError(LogFilter.Sql, $"Table `vehicle_template_accessory`: rideSpellId {rideSpellId} does not exist for entry {entry}.");
continue;
}
}
if (GetCreatureTemplate(entry) == null)
{
Log.outError(LogFilter.Sql, "Table `vehicle_template_accessory`: creature template entry {0} does not exist.", entry);
@@ -11439,7 +11451,7 @@ namespace Game
continue;
}
_vehicleTemplateAccessoryStore.Add(entry, new VehicleAccessory(accessory, seatId, isMinion, summonType, summonTimer));
_vehicleTemplateAccessoryStore.Add(entry, new VehicleAccessory(accessory, seatId, isMinion, summonType, summonTimer, rideSpellId));
++count;
}
@@ -11455,8 +11467,8 @@ namespace Game
uint count = 0;
// 0 1 2 3 4 5
SQLResult result = DB.World.Query("SELECT `guid`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer` FROM `vehicle_accessory`");
// 0 1 2 3 4 5 6
SQLResult result = DB.World.Query("SELECT `guid`, `accessory_entry`, `seat_id`, `minion`, `summontype`, `summontimer`, `RideSpellID` FROM `vehicle_accessory`");
if (result.IsEmpty())
{
@@ -11473,13 +11485,25 @@ namespace Game
byte uiSummonType = result.Read<byte>(4);
uint uiSummonTimer = result.Read<uint>(5);
uint? rideSpellId = null;
if (!result.IsNull(6))
{
rideSpellId = result.Read<uint>(6);
if (!Global.SpellMgr.HasSpellInfo(rideSpellId.Value, Difficulty.None))
{
Log.outError(LogFilter.Sql, $"Table `vehicle_accessory`: rideSpellId {rideSpellId} does not exist for guid {uiGUID}.");
continue;
}
}
if (GetCreatureTemplate(uiAccessory) == null)
{
Log.outError(LogFilter.Sql, "Table `vehicle_accessory`: Accessory {0} does not exist.", uiAccessory);
continue;
}
_vehicleAccessoryStore.Add(uiGUID, new VehicleAccessory(uiAccessory, uiSeat, bMinion, uiSummonType, uiSummonTimer));
_vehicleAccessoryStore.Add(uiGUID, new VehicleAccessory(uiAccessory, uiSeat, bMinion, uiSummonType, uiSummonTimer, rideSpellId));
++count;
}