From 044359a6b7584b0bf475c4860afa6dd10b40552a Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 23 Nov 2021 21:22:57 -0500 Subject: [PATCH] Core/Units: Fixed crash with charm/possess Port From (https://github.com/TrinityCore/TrinityCore/commit/de8e1a4820ec5b3523209f89e7519e27b53060e2) --- Source/Game/Entities/Unit/Unit.Pets.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/Unit/Unit.Pets.cs b/Source/Game/Entities/Unit/Unit.Pets.cs index 2ca25e15b..cae5fa554 100644 --- a/Source/Game/Entities/Unit/Unit.Pets.cs +++ b/Source/Game/Entities/Unit/Unit.Pets.cs @@ -560,7 +560,7 @@ namespace Game.Entities charm.SetPvpFlags(GetPvpFlags()); Cypher.Assert(charm.GetCharmerGUID().IsEmpty(), $"Unit {charm.GetEntry()} is being charmed, but it already has a charmer {charm.GetCharmerGUID()}"); - charm.SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.CharmedBy), GetGUID()); + charm.SetUpdateFieldValue(charm.m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.CharmedBy), GetGUID()); charm.m_charmer = this; _isWalkingBeforeCharm = charm.IsWalking(); @@ -582,7 +582,7 @@ namespace Game.Entities } Cypher.Assert(charm.GetCharmerGUID() == GetGUID(), $"Unit {charm.GetEntry()} is being uncharmed, but it has another charmer {charm.GetCharmerGUID()}"); - charm.SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.CharmedBy), ObjectGuid.Empty); + charm.SetUpdateFieldValue(charm.m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.CharmedBy), ObjectGuid.Empty); charm.m_charmer = null; Player player = charm.GetCharmerOrOwnerPlayerOrPlayerItself();