From f208e62e91fd4db120decf516a0e88e8347e52cb Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 5 Mar 2024 18:18:06 -0500 Subject: [PATCH] Core/Units: Set UNIT_FLAG3_FAKE_DEAD as disallowed flag for database column Port From (https://github.com/TrinityCore/TrinityCore/commit/a5a2f5af2ddd1ea7166d3e1ee177534fbfbeef3f) --- Source/Framework/Constants/CreatureConst.cs | 2 +- Source/Game/Entities/Player/Player.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Framework/Constants/CreatureConst.cs b/Source/Framework/Constants/CreatureConst.cs index 15e1bac28..ad4aee9dd 100644 --- a/Source/Framework/Constants/CreatureConst.cs +++ b/Source/Framework/Constants/CreatureConst.cs @@ -166,7 +166,7 @@ namespace Framework.Constants Disallowed = (Unk0 | /* UnconsciousOnDeath | */ /* AllowMountedCombat | */ GarrisonPet | /* UiCanGetPosition | */ /* AiObstacle | */ AlternativeDefaultLanguage | /* SuppressAllNpcFeedback | */ IgnoreCombat | SuppressNpcFeedback | Unk10 | Unk11 | - Unk12 | /* FakeDead | */ /* NoFacingOnInteractAndFastFacingChase | */ /* UntargetableFromUi | */ + Unk12 | FakeDead | /* NoFacingOnInteractAndFastFacingChase | */ /* UntargetableFromUi | */ /* NoFacingOnInteractWhileFakeDead | */ AlreadySkinned | /* SuppressAllNpcSounds | */ /* SuppressNpcSounds | */ AllowInteractionWhileInCombat | Unk21 | /* DontFadeOut | */ Unk23 | ForceHideNameplate | Unk25 | Unk26 | Unk27 | diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 8c901942e..b71493071 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -5473,7 +5473,7 @@ namespace Game.Entities // not unfriendly/hostile if (!creature.IsInteractionAllowedWhileHostile() && creature.GetReactionTo(this) <= ReputationRank.Unfriendly) - return nullptr; + return null; if (creature.IsInCombat() && !creature.IsInteractionAllowedInCombat()) return null;