From 03124f0dd64ef00b3575d5602b601fcd65ad61ba Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 23 Jul 2026 22:29:21 +0200 Subject: [PATCH] Core/Misc: Port cherrypick refactors --- src/server/game/Handlers/LootHandler.cpp | 2 +- src/server/game/Server/Packets/LootPackets.h | 4 ++-- src/server/game/Spells/SpellEffects.cpp | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp index 2da0ced999..3b14b118d6 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -177,7 +177,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPackets::Loot::LootMoney& /*packet WorldPackets::Loot::LootMoneyNotify packet; packet.Money = goldPerPlayer; packet.MoneyMod = goldMod; - packet.SoleLooter = playersNear.size() <= 1 ? true : false; + packet.SoleLooter = playersNear.size() <= 1; (*i)->SendDirectMessage(packet.Write()); } } diff --git a/src/server/game/Server/Packets/LootPackets.h b/src/server/game/Server/Packets/LootPackets.h index 1065d4905b..f6bbfd1bbb 100644 --- a/src/server/game/Server/Packets/LootPackets.h +++ b/src/server/game/Server/Packets/LootPackets.h @@ -142,7 +142,7 @@ namespace WorldPackets class LootMoneyNotify final : public ServerPacket { public: - explicit LootMoneyNotify() : ServerPacket(SMSG_LOOT_MONEY_NOTIFY, 5) { } + explicit LootMoneyNotify() : ServerPacket(SMSG_LOOT_MONEY_NOTIFY, 8 + 8 + 1) { } WorldPacket const* Write() override; @@ -154,7 +154,7 @@ namespace WorldPackets class CoinRemoved final : public ServerPacket { public: - explicit CoinRemoved() : ServerPacket(SMSG_COIN_REMOVED, 9) { } + explicit CoinRemoved() : ServerPacket(SMSG_COIN_REMOVED, 16) { } WorldPacket const* Write() override; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 84d5b79316..08b027c9d1 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2326,10 +2326,11 @@ void Spell::EffectUntrainTalents() if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || m_caster->GetTypeId() == TYPEID_PLAYER) + if (!unitTarget->IsPlayer()) return; - unitTarget->ToPlayer()->SendRespecWipeConfirm(m_caster->GetGUID(), unitTarget->ToPlayer()->GetNextResetTalentsCost(), SPEC_RESET_TALENTS); + Player* playerTarget = unitTarget->ToPlayer(); + playerTarget->SendRespecWipeConfirm(m_caster->GetGUID(), playerTarget->GetNextResetTalentsCost(), SPEC_RESET_TALENTS); } void Spell::EffectTeleUnitsFaceCaster()