diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-09-07 01:10:07 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-09-07 01:10:07 +0200 |
| commit | 8efeb202a500bda46283127f66fb85f6b91f9e76 (patch) | |
| tree | c6c12b633d144d26927f615af4d3d64b07e62dcc /src/server/game/Spells/Spell.cpp | |
| parent | 0bf5cf33c7dd909202ef492b69e317652e923f96 (diff) | |
Core: Update to 10.1.7
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 6e5fc130645..19a68fa341d 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -144,7 +144,7 @@ SpellCastTargets::SpellCastTargets(Unit* caster, WorldPackets::Spells::SpellCast else pos = &m_src._position; - pos->Relocate(spellCastRequest.Target.SrcLocation->Location); + pos->Relocate(spellCastRequest.Target.SrcLocation->Location.Pos); if (spellCastRequest.Target.Orientation) pos->SetOrientation(*spellCastRequest.Target.Orientation); } @@ -158,7 +158,7 @@ SpellCastTargets::SpellCastTargets(Unit* caster, WorldPackets::Spells::SpellCast else pos = &m_dst._position; - pos->Relocate(spellCastRequest.Target.DstLocation->Location); + pos->Relocate(spellCastRequest.Target.DstLocation->Location.Pos); if (spellCastRequest.Target.Orientation) pos->SetOrientation(*spellCastRequest.Target.Orientation); } @@ -4734,7 +4734,7 @@ void Spell::SendSpellStart() } if (castFlags & CAST_FLAG_PROJECTILE) - UpdateSpellCastDataAmmo(castData.Ammo); + castData.AmmoDisplayID = GetSpellCastDataAmmo(); if (castFlags & CAST_FLAG_IMMUNITY) { @@ -4883,7 +4883,7 @@ void Spell::UpdateSpellCastDataTargets(WorldPackets::Spells::SpellCastData& data m_channelTargetEffectMask = 0; } -void Spell::UpdateSpellCastDataAmmo(WorldPackets::Spells::SpellAmmo& ammo) +int32 Spell::GetSpellCastDataAmmo() { uint32 ammoInventoryType = 0; uint32 ammoDisplayID = 0; @@ -4950,8 +4950,7 @@ void Spell::UpdateSpellCastDataAmmo(WorldPackets::Spells::SpellAmmo& ammo) } } - ammo.DisplayID = ammoDisplayID; - ammo.InventoryType = ammoInventoryType; + return ammoDisplayID; } void Spell::SendSpellExecuteLog() |