From 01e515d94b0422edcbef1e88c4528bf6abc2f4dd Mon Sep 17 00:00:00 2001 From: Rat Date: Thu, 12 Jan 2012 14:16:16 +0100 Subject: Core/Spells: fixed SMSG_SET_FLAT_SPELL_MODIFIER and SMSG_SET_PCT_SPELL_MODIFIER by Shauren changed TOTAL_AURAS to 363 (biggest number in dbc files) --- src/server/game/Entities/Player/Player.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/server/game/Entities/Player') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 979c62942f1..975599eae01 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -19923,9 +19923,15 @@ void Player::AddSpellMod(SpellModifier* mod, bool apply) int i = 0; flag96 _mask = 0; + uint32 modTypeCount = 0; // count of mods per one mod->op + WorldPacket data(Opcodes(opcode), 1); + data << uint32(1); // count of different mod->op's in packet + size_t writePos = data.wpos(); + data << uint32(modTypeCount); + data << uint8(mod->op); for (int eff = 0; eff < 96; ++eff) { - if (eff != 0 && eff % 32 == 0) + if (eff != 0 && (eff % 32) == 0) _mask[i++] = 0; _mask[i] = uint32(1) << (eff - (32 * i)); @@ -19936,16 +19942,14 @@ void Player::AddSpellMod(SpellModifier* mod, bool apply) if ((*itr)->type == mod->type && (*itr)->mask & _mask) val += (*itr)->value; val += apply ? mod->value : -(mod->value); - WorldPacket data(Opcodes(opcode), (1+1+4)); + data << uint8(eff); - data << uint8(mod->op); - data << int32(val); - if (opcode == SMSG_SET_PCT_SPELL_MODIFIER) - data << uint8(0); // 4.x unk - SendDirectMessage(&data); + data << float(val); + ++modTypeCount; } } - + data.put(writePos, modTypeCount); + SendDirectMessage(&data); if (apply) m_spellMods[mod->op].push_back(mod); else -- cgit v1.2.3