diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-11-21 18:49:55 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-11-21 18:49:55 +0100 |
| commit | de8e1a4820ec5b3523209f89e7519e27b53060e2 (patch) | |
| tree | feb0e0e7a7b1739e9bd7a3d5a157fa3e4b0f5cfa /src | |
| parent | ed884354944009979b828d21ee3498e830050af8 (diff) | |
Core/Units: Fixed crash with charm/possess
Closes #27168
Closes #27247
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |