araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 06:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Packets: Update and enable SMSG_COOLDOWN_EVENT

Browse Source 
Fix build.
This commit is contained in:
Duarte Duarte
2015-02-11 23:09:56 +00:00
parent cbfe638fa5
commit 6678635cc7
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+4 -8
View File
@@ -22059,10 +22059,8 @@ void Player::SendCooldownEvent(SpellInfo const* spellInfo, uint32 itemId /*= 0*/
AddSpellAndCategoryCooldowns(spellInfo, itemId, spell);
// Send activate cooldown timer (possible 0) at client side
WorldPacket data(SMSG_COOLDOWN_EVENT, 4 + 8);
data << uint32(spellInfo->Id);
data << GetGUID();
SendDirectMessage(&data);
WorldPackets::Spells::CooldownEvent packet(GetGUID(), spellInfo->Id);
SendDirectMessage(packet.Write());
uint32 cat = spellInfo->GetCategory();
if (cat && spellInfo->CategoryRecoveryTime)
@@ -22083,10 +22081,8 @@ void Player::SendCooldownEvent(SpellInfo const* spellInfo, uint32 itemId /*= 0*/
if (catSet.find(i->first) != catSet.end())
{
// Send activate cooldown timer (possible 0) at client side
WorldPacket data(SMSG_COOLDOWN_EVENT, 4 + 8);
data << uint32(i->first);
data << uint64(GetGUID());
SendDirectMessage(&data);
WorldPackets::Spells::CooldownEvent packet(GetGUID(), i->first);
SendDirectMessage(packet.Write());
}
}
}
src/server/game/Server/Packets/SpellPackets.cpp
+8
View File
@@ -470,3 +470,11 @@ WorldPacket const* WorldPackets::Spells::UnlearnedSpells::Write()
return &_worldPacket;
}
WorldPacket const* WorldPackets::Spells::CooldownEvent::Write()
{
_worldPacket << CasterGUID;
_worldPacket << int32(SpellID);
return &_worldPacket;
}
src/server/game/Server/Packets/SpellPackets.h
+12
View File
@@ -397,6 +397,18 @@ namespace WorldPackets
std::vector<uint32> SpellID;
};
class CooldownEvent final : public ServerPacket
{
public:
CooldownEvent() : ServerPacket(SMSG_COOLDOWN_EVENT, 16 + 4) { }
CooldownEvent(ObjectGuid casterGuid, int32 spellId) : ServerPacket(SMSG_COOLDOWN_EVENT, 16 + 4), CasterGUID(casterGuid), SpellID(spellId) { }
WorldPacket const* Write() override;
ObjectGuid CasterGUID;
int32 SpellID;
};
}
}
src/server/game/Server/Protocol/Opcodes.cpp
+1 -1
View File
@@ -1167,7 +1167,7 @@ void OpcodeTable::Initialize()
DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONTACT_STATUS, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_CONVERT_RUNE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_COOLDOWN_CHEAT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_COOLDOWN_EVENT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_COOLDOWN_EVENT, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_CORPSE_LOCATION, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_CORPSE_RECLAIM_DELAY, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_CORPSE_TRANSPORT_QUERY, STATUS_NEVER, CONNECTION_TYPE_REALM);