diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-06-09 22:03:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-06-09 22:03:33 +0200 |
| commit | 9a1246978f79e866f484f67da8c05122d4a47bbf (patch) | |
| tree | 2c2234e0ce58defcbc0632ebb6002fd30888e285 | |
| parent | f14c66b5e4c157fa3ba4d18532a274f651d6c741 (diff) | |
Core/Units: Updated dynamicflags
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4106beb6862..c473e4fb535 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -15708,16 +15708,12 @@ void Unit::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* target) // hide lootable animation for unallowed players else if (index == OBJECT_DYNAMIC_FLAGS) { - uint32 dynamicFlags = m_uint32Values[OBJECT_DYNAMIC_FLAGS] & ~(UNIT_DYNFLAG_TAPPED | UNIT_DYNFLAG_TAPPED_BY_PLAYER); + uint32 dynamicFlags = m_uint32Values[OBJECT_DYNAMIC_FLAGS] & ~UNIT_DYNFLAG_TAPPED; if (creature) { - if (creature->hasLootRecipient()) - { + if (creature->hasLootRecipient() && !creature->isTappedBy(target)) dynamicFlags |= UNIT_DYNFLAG_TAPPED; - if (creature->isTappedBy(target)) - dynamicFlags |= UNIT_DYNFLAG_TAPPED_BY_PLAYER; - } if (!target->isAllowedToLoot(creature)) dynamicFlags &= ~UNIT_DYNFLAG_LOOTABLE; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 54d5e95b2f4..00c926acbb0 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -4396,11 +4396,9 @@ enum UnitDynFlags UNIT_DYNFLAG_LOOTABLE = 0x0002, UNIT_DYNFLAG_TRACK_UNIT = 0x0004, UNIT_DYNFLAG_TAPPED = 0x0008, // Lua_UnitIsTapped - UNIT_DYNFLAG_TAPPED_BY_PLAYER = 0x0010, // Lua_UnitIsTappedByPlayer - UNIT_DYNFLAG_SPECIALINFO = 0x0020, - UNIT_DYNFLAG_DEAD = 0x0040, - UNIT_DYNFLAG_REFER_A_FRIEND = 0x0080, - UNIT_DYNFLAG_TAPPED_BY_ALL_THREAT_LIST = 0x0100 // Lua_UnitIsTappedByAllThreatList + UNIT_DYNFLAG_SPECIALINFO = 0x0010, + UNIT_DYNFLAG_DEAD = 0x0020, + UNIT_DYNFLAG_REFER_A_FRIEND = 0x0040 }; enum CorpseDynFlags |