From 3961330d44fe8af8128fafbfcebe5714aa656e87 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 24 May 2026 21:30:08 +0200 Subject: [PATCH] Core/Misc: Port some 3.3.5 cherry-pick refactors --- src/server/game/Handlers/ItemHandler.cpp | 5 +---- src/server/game/Quests/QuestDef.h | 2 +- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 14 ++++++-------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index d6b70b68b6..7fd4150243 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -342,10 +342,7 @@ void WorldSession::HandleDestroyItemOpcode(WorldPackets::Item::DestroyItem& dest } if (destroyItem.Count) - { - uint32 i_count = destroyItem.Count; - _player->DestroyItemCount(item, i_count, true); - } + _player->DestroyItemCount(item, destroyItem.Count, true); else _player->DestroyItem(destroyItem.ContainerId, destroyItem.SlotNum, true); } diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index 829ca81492..3e527c634a 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -823,7 +823,7 @@ class TC_GAME_API Quest int32 _questGiverPortraitMount = 0; int32 _questGiverPortraitModelSceneId = 0; uint32 _questTurnInPortrait = 0; - uint32 _rewardReputationMask; + uint32 _rewardReputationMask = 0; uint32 _soundAccept = 0; uint32 _soundTurnIn = 0; uint32 _areaGroupID = 0; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 853865493d..7e1a9f751c 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1693,15 +1693,13 @@ void AuraEffect::HandleModInvisibility(AuraApplication const* aurApp, uint8 mode else { if (!target->HasAuraTypeWithMiscvalue(SPELL_AURA_MOD_INVISIBILITY, type)) - { - // if not have invisibility auras of type INVISIBILITY_GENERAL - // remove glow vision - if (type == INVISIBILITY_GENERAL) - if (Player* playerTarget = target->ToPlayer()) - playerTarget->RemoveAuraVision(PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW); - target->m_invisibility.DelFlag(type); - } + + // if not have invisibility auras of type INVISIBILITY_GENERAL + // remove glow vision + if (!target->m_invisibility.HasFlag(INVISIBILITY_GENERAL)) + if (Player* playerTarget = target->ToPlayer()) + playerTarget->RemoveAuraVision(PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW); if (!target->HasAuraType(SPELL_AURA_MOD_INVISIBILITY)) target->RemoveVisFlag(UNIT_VIS_FLAGS_INVISIBLE);