diff options
| author | Shauren <shauren.trinity@gmail.com> | 2019-06-03 20:40:34 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-06-08 17:06:57 +0200 |
| commit | 455959c6064af6f7863a6b4b57cb0ef1646bd8ef (patch) | |
| tree | 7d7a7cdd3a44643ee5fc7d19521ced1c8b815c66 /src/server/game/Battlefield/Battlefield.cpp | |
| parent | 31fda79556e55375962a3c9e46f6dbdbf6e90d18 (diff) | |
Core/PacketIO: Rewrite updatefield handling
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 39aced653c8..0bd37951c5a 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -493,7 +493,7 @@ void Battlefield::HideNpc(Creature* creature) { creature->CombatStop(); creature->SetReactState(REACT_PASSIVE); - creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); + creature->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)); creature->DisappearAndDie(); creature->SetVisible(false); } @@ -501,14 +501,14 @@ void Battlefield::HideNpc(Creature* creature) void Battlefield::ShowNpc(Creature* creature, bool aggressive) { creature->SetVisible(true); - creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); + creature->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)); if (!creature->IsAlive()) creature->Respawn(true); if (aggressive) creature->SetReactState(REACT_AGGRESSIVE); else { - creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + creature->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); creature->SetReactState(REACT_PASSIVE); } } |