Core/Misc: Port some 3.3.5 cherry-pick refactors
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user