From 832e763d36fbc22b836ce576ad52742516ae4322 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 7 Apr 2020 17:25:15 +0200 Subject: [PATCH] Core/Packets: implement and enable SMSG_MOUNT_RESULT and use it for transformed cases --- src/server/game/Miscellaneous/SharedDefines.h | 15 ++++++++++++ .../game/Server/Packets/SpellPackets.cpp | 7 ++++++ src/server/game/Server/Packets/SpellPackets.h | 10 ++++++++ src/server/game/Server/Protocol/Opcodes.cpp | 2 +- src/server/game/Server/Protocol/Opcodes.h | 4 ++-- src/server/game/Spells/Spell.cpp | 24 ++++++++++++++++++- src/server/game/Spells/Spell.h | 1 + 7 files changed, 59 insertions(+), 4 deletions(-) diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 12a135bb73..741074340a 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -4294,6 +4294,21 @@ enum UpdateCollisionHeightReason : uint8 UPDATE_COLLISION_HEIGHT_SCALE = 1 }; +enum MountResult : uint8 +{ + MOUNT_RESULT_INVALID_MOUNTEE = 0, + MOUNT_RESULT_TOO_FAR_AWAY = 1, + MOUNT_RESULT_ALREADY_MOUNTED = 2, + MOUNT_RESULT_NOT_MOUNTABLE = 3, + MOUNT_RESULT_NOT_YOUR_PET = 4, + MOUNT_RESULT_OTHER = 5, + MOUNT_RESULT_LOOTING = 6, + MOUNT_RESULT_RACE_CANT_MOUNT = 7, + MOUNT_RESULT_SHAPESHIFTED = 8, + MOUNT_RESULT_FORCE_DISMOUNT = 9, + MOUNT_RESULT_OK = 10 // never sent +}; + #define MAX_CREATURE_SPELL_DATA_SLOT 4 #endif diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp index 42ae118016..bb113f2efd 100644 --- a/src/server/game/Server/Packets/SpellPackets.cpp +++ b/src/server/game/Server/Packets/SpellPackets.cpp @@ -198,3 +198,10 @@ WorldPacket const* WorldPackets::Spells::ChannelStart::Write() return &_worldPacket; } + +WorldPacket const* WorldPackets::Spells::MountResult::Write() +{ + _worldPacket << int32(Result); + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h index 9a985167e3..9d7a3d34a1 100644 --- a/src/server/game/Server/Packets/SpellPackets.h +++ b/src/server/game/Server/Packets/SpellPackets.h @@ -168,6 +168,16 @@ namespace WorldPackets int32 SpellID = 0; uint32 ChannelDuration = 0; }; + + class MountResult final : public ServerPacket + { + public: + MountResult() : ServerPacket(SMSG_MOUNT_RESULT, 4) { } + + WorldPacket const* Write() override; + + uint32 Result = 0; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index c234be7a9e..aeb37a2afb 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1024,7 +1024,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_MONSTER_MOVE, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MONSTER_MOVE_TRANSPORT, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOTD, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOUNTRESULT, STATUS_UNHANDLED, CONNECTION_TYPE_INSTANCE); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOUNT_RESULT, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOUNTSPECIAL_ANIM, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_COLLISION_DISABLE, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_COLLISION_ENABLE, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index f1e3973f9e..865eb24fd7 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -975,7 +975,7 @@ enum OpcodeServer SMSG_MONSTER_MOVE = 0x6E17, SMSG_MONSTER_MOVE_TRANSPORT = 0x2004, SMSG_MOTD = 0x0A35, - SMSG_MOUNTRESULT = 0x2225, + SMSG_MOUNT_RESULT = 0x2225, SMSG_MOUNTSPECIAL_ANIM = 0x0217, SMSG_MOVE_COLLISION_DISABLE = 0x31B0, SMSG_MOVE_COLLISION_ENABLE = 0x11A7, @@ -1396,7 +1396,7 @@ inline bool IsInstanceOnlyOpcode(uint32 opcode) case SMSG_ITEM_PUSH_RESULT: case SMSG_QUEST_GIVER_STATUS: case SMSG_QUERY_TIME_RESPONSE: - case SMSG_MOUNTRESULT: + case SMSG_MOUNT_RESULT: case SMSG_DUEL_COMPLETE: case SMSG_LOOT_MONEY_NOTIFY: case SMSG_LOOT_CLEAR_MONEY: diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 1d3f261666..277e705336 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4240,6 +4240,25 @@ void Spell::SendPetCastResult(SpellCastResult result) player->SendDirectMessage(&data); } + +void Spell::SendMountResult(MountResult result) +{ + if (result == MOUNT_RESULT_OK) + return; + + if (!m_caster->IsPlayer()) + return; + + if (m_caster->ToPlayer()->IsLoading()) // don't send mount results at loading time + return; + + Player* caster = m_caster->ToPlayer(); + + WorldPackets::Spells::MountResult packet; + packet.Result = result; + caster->SendDirectMessage(packet.Write()); +} + void Spell::SendSpellStart() { if (!IsNeedSendToClient()) @@ -6120,7 +6139,10 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint return SPELL_FAILED_NO_MOUNTS_ALLOWED; if (m_caster->IsInDisallowedMountForm()) - return SPELL_FAILED_NOT_SHAPESHIFT; + { + SendMountResult(MOUNT_RESULT_SHAPESHIFTED); // mount result gets sent before the cast result + return SPELL_FAILED_DONT_REPORT; + } break; } diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index deca66d42e..1fa883d4d7 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -487,6 +487,7 @@ class TC_GAME_API Spell static void WriteCastResultInfo(WorldPacket& data, Player* caster, SpellInfo const* spellInfo, uint8 castCount, SpellCastResult result, SpellCustomErrors customError, uint32* param1 = nullptr, uint32* param2 = nullptr); static void SendCastResult(Player* caster, SpellInfo const* spellInfo, uint8 castCount, SpellCastResult result, SpellCustomErrors customError = SPELL_CUSTOM_ERROR_NONE, uint32* param1 = nullptr, uint32* param2 = nullptr); void SendCastResult(SpellCastResult result, uint32* param1 = nullptr, uint32* param2 = nullptr) const; + void SendMountResult(MountResult result); void SendPetCastResult(SpellCastResult result); void SendSpellStart(); void SendSpellGo();