From 88fea990ff1408b94076fb9dbd0c974908d6a731 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 18 Aug 2024 10:58:34 +0200 Subject: Core/Players: Use PlayerData::VirtualPlayerRealm instead of global GetVirtualRealmAddress() where possible --- src/server/game/Spells/Spell.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/server/game/Spells/Spell.cpp') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index a0752dac0ed..40c604c9c71 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5457,7 +5457,11 @@ void Spell::SendResurrectRequest(Player* target) WorldPackets::Spells::ResurrectRequest resurrectRequest; resurrectRequest.ResurrectOffererGUID = m_caster->GetGUID(); - resurrectRequest.ResurrectOffererVirtualRealmAddress = GetVirtualRealmAddress(); + if (Player const* playerCaster = m_caster->ToPlayer()) + resurrectRequest.ResurrectOffererVirtualRealmAddress = playerCaster->m_playerData->VirtualPlayerRealm; + else + resurrectRequest.ResurrectOffererVirtualRealmAddress = GetVirtualRealmAddress(); + resurrectRequest.Name = sentName; resurrectRequest.Sickness = m_caster->IsUnit() && m_caster->ToUnit()->IsSpiritHealer(); // "you'll be afflicted with resurrection sickness" resurrectRequest.UseTimer = !m_spellInfo->HasAttribute(SPELL_ATTR3_NO_RES_TIMER); -- cgit v1.2.3