From de8e1a4820ec5b3523209f89e7519e27b53060e2 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 21 Nov 2021 18:49:55 +0100 Subject: Core/Units: Fixed crash with charm/possess Closes #27168 Closes #27247 --- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index f0b08cd7965..58e93b527c5 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5987,7 +5987,7 @@ void Unit::SetCharm(Unit* charm, bool apply) ASSERT(charm->GetCharmerGUID().IsEmpty(), "Unit %u is being charmed, but it already has a charmer %s", charm->GetEntry(), charm->GetCharmerGUID().ToString().c_str()); - charm->SetUpdateFieldValue(m_values.ModifyValue(&Unit::m_unitData).ModifyValue(&UF::UnitData::CharmedBy), GetGUID()); + charm->SetUpdateFieldValue(charm->m_values.ModifyValue(&Unit::m_unitData).ModifyValue(&UF::UnitData::CharmedBy), GetGUID()); charm->m_charmer = this; _isWalkingBeforeCharm = charm->IsWalking(); @@ -6010,7 +6010,7 @@ void Unit::SetCharm(Unit* charm, bool apply) ASSERT(charm->GetCharmerGUID() == GetGUID(), "Unit %u is being uncharmed, but it has another charmer %s", charm->GetEntry(), charm->GetCharmerGUID().ToString().c_str()); - charm->SetUpdateFieldValue(m_values.ModifyValue(&Unit::m_unitData).ModifyValue(&UF::UnitData::CharmedBy), ObjectGuid::Empty); + charm->SetUpdateFieldValue(charm->m_values.ModifyValue(&Unit::m_unitData).ModifyValue(&UF::UnitData::CharmedBy), ObjectGuid::Empty); charm->m_charmer = nullptr; if (charm->GetTypeId() == TYPEID_PLAYER) -- cgit v1.2.3