diff options
| -rw-r--r-- | src/server/game/Handlers/GroupHandler.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraDefines.h | 3 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 5ea81718a5d..3ed187c9624 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -793,7 +793,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke { uint64 auramask = player->GetAuraUpdateMaskForRaid(); *data << uint64(auramask); - for (uint32 i = 0; i < MAX_AURAS; ++i) + for (uint32 i = 0; i < MAX_AURAS_GROUP_UPDATE; ++i) { if (auramask & (uint64(1) << i)) { @@ -875,7 +875,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke { uint64 auramask = pet->GetAuraUpdateMaskForRaid(); *data << uint64(auramask); - for (uint32 i = 0; i < MAX_AURAS; ++i) + for (uint32 i = 0; i < MAX_AURAS_GROUP_UPDATE; ++i) { if (auramask & (uint64(1) << i)) { @@ -977,7 +977,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recvData) uint64 auraMask = 0; size_t maskPos = data.wpos(); data << uint64(auraMask); // placeholder - for (uint8 i = 0; i < MAX_AURAS; ++i) + for (uint8 i = 0; i < MAX_AURAS_GROUP_UPDATE; ++i) { if (AuraApplication const* aurApp = player->GetVisibleAura(i)) { @@ -1015,7 +1015,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recvData) data << uint64(petAuraMask); // placeholder if (pet) { - for (uint8 i = 0; i < MAX_AURAS; ++i) + for (uint8 i = 0; i < MAX_AURAS_GROUP_UPDATE; ++i) { if (AuraApplication const* aurApp = pet->GetVisibleAura(i)) { diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index 43f6b51031a..f49ec8b3815 100644 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -18,7 +18,8 @@ #ifndef TRINITY_SPELLAURADEFINES_H #define TRINITY_SPELLAURADEFINES_H -#define MAX_AURAS 64 // client support up to 255, but it will cause problems with group auras updating +#define MAX_AURAS 255 // Client-side limit +#define MAX_AURAS_GROUP_UPDATE 64 // Limit of SMSG_PARY_MEMBER_STATS_FULL and SMSG_PARTY_MEMBER_STATS enum AURA_FLAGS { diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 35606989240..85eb993e1b2 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -78,7 +78,7 @@ _flags(AFLAG_NONE), _effectsToApply(effMask), _needClientUpdate(false) TC_LOG_DEBUG("spells", "Aura: %u Effect: %d put to unit visible auras slot: %u", GetBase()->GetId(), GetEffectMask(), slot); } else - TC_LOG_DEBUG("spells", "Aura: %u Effect: %d could not find empty unit visible slot", GetBase()->GetId(), GetEffectMask()); + TC_LOG_ERROR("spells", "Aura: %u Effect: %d could not find empty unit visible slot", GetBase()->GetId(), GetEffectMask()); } _InitFlags(caster, effMask); |