aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Battlefield/Battlefield.cpp
diff options
context:
space:
mode:
authorTeleqraph <nyrdeveloper@gmail.com>2023-07-20 19:09:27 +0200
committerGitHub <noreply@github.com>2023-07-20 19:09:27 +0200
commit88ff97c1f96381565c47f8ca1993bdc7fce19fd6 (patch)
treee2b89eb2da0a1a01e8f4eef0a37328e997cb344c /src/server/game/Battlefield/Battlefield.cpp
parentd4112334142f85addcf784bf3b4fb3b04773f1cd (diff)
Core/Units: Added helper functions to modify UNIT_FLAG_UNINTERACTIBLE (#29159)
Co-authored-by: Shauren <shauren.trinity@gmail.com>
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
-rw-r--r--src/server/game/Battlefield/Battlefield.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index 7893b925bc3..030ca20fec8 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -463,7 +463,8 @@ void Battlefield::HideNpc(Creature* creature)
{
creature->CombatStop();
creature->SetReactState(REACT_PASSIVE);
- creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE);
+ creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
+ creature->SetUninteractible(true);
creature->DisappearAndDie();
creature->SetVisible(false);
}
@@ -471,7 +472,8 @@ void Battlefield::HideNpc(Creature* creature)
void Battlefield::ShowNpc(Creature* creature, bool aggressive)
{
creature->SetVisible(true);
- creature->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE);
+ creature->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
+ creature->SetUninteractible(false);
if (!creature->IsAlive())
creature->Respawn(true);
if (aggressive)