diff options
| author | ModoX <moardox@gmail.com> | 2024-10-18 11:18:56 +0200 |
|---|---|---|
| committer | ModoX <moardox@gmail.com> | 2024-10-18 11:20:37 +0200 |
| commit | 72d952db74d0c4a6e90d7a387774d090eb4a842b (patch) | |
| tree | 841abbcbdb2f2bed819383efd5e16f72d911b49b /src/server/game | |
| parent | 0dd6dd782e624155fc27def951fa1fcb3114f0a1 (diff) | |
Core/Creature: Remove UNIT_FLAG3_FAKE_DEAD and UNIT_FLAG2_FEIGN_DEATH if no unit_flags are set
* d66f2dcdac2f1602f36cd9f1720fdbf274a37c61 followup
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 7545b4f1b35..cfa7a86fa08 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2355,13 +2355,10 @@ void ObjectMgr::LoadCreatures() *data.unit_flags2 &= UNIT_FLAG2_ALLOWED; } - if (data.unit_flags.has_value()) + if (*data.unit_flags2 & UNIT_FLAG2_FEIGN_DEATH && (!data.unit_flags.has_value() || !(*data.unit_flags & (UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC)))) { - if (*data.unit_flags2 & UNIT_FLAG2_FEIGN_DEATH && !(*data.unit_flags & (UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC))) - { - TC_LOG_ERROR("sql.sql", "Table `creature` has creature (GUID: {} Entry: {}) has UNIT_FLAG2_FEIGN_DEATH set without IMMUNE_TO_PC | IMMUNE_TO_NPC, removing incorrect flag.", guid, data.id); - *data.unit_flags2 &= ~UNIT_FLAG2_FEIGN_DEATH; - } + TC_LOG_ERROR("sql.sql", "Table `creature` has creature (GUID: {} Entry: {}) has UNIT_FLAG2_FEIGN_DEATH set without IMMUNE_TO_PC | IMMUNE_TO_NPC, removing incorrect flag.", guid, data.id); + *data.unit_flags2 &= ~UNIT_FLAG2_FEIGN_DEATH; } } @@ -2373,13 +2370,10 @@ void ObjectMgr::LoadCreatures() *data.unit_flags3 &= UNIT_FLAG3_ALLOWED; } - if (data.unit_flags.has_value()) + if (*data.unit_flags3 & UNIT_FLAG3_FAKE_DEAD && (!data.unit_flags.has_value() || !(*data.unit_flags & (UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC)))) { - if (*data.unit_flags3 & UNIT_FLAG3_FAKE_DEAD && !(*data.unit_flags & (UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC))) - { - TC_LOG_ERROR("sql.sql", "Table `creature` has creature (GUID: {} Entry: {}) has UNIT_FLAG3_FAKE_DEAD set without IMMUNE_TO_PC | IMMUNE_TO_NPC, removing incorrect flag.", guid, data.id); - *data.unit_flags3 &= ~UNIT_FLAG3_FAKE_DEAD; - } + TC_LOG_ERROR("sql.sql", "Table `creature` has creature (GUID: {} Entry: {}) has UNIT_FLAG3_FAKE_DEAD set without IMMUNE_TO_PC | IMMUNE_TO_NPC, removing incorrect flag.", guid, data.id); + *data.unit_flags3 &= ~UNIT_FLAG3_FAKE_DEAD; } } |