Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge with 342.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2008-11-28 13:10:16 -06:00
parent fb2c984b03 b37d7ae042
commit 93ba82e8ca
19 changed files with 277 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/Unit.cpp
View File

@@ -881,8 +881,9 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
if(damagetype == DIRECT_DAMAGE || damagetype == SPELL_DIRECT_DAMAGE)
{
//TODO: This is from procflag, I do not know which spell needs this
//Maim?
//if (!spellProto || !(spellProto->AuraInterruptFlags&AURA_INTERRUPT_FLAG_DIRECT_DAMAGE))
pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DIRECT_DAMAGE);
pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DIRECT_DAMAGE, spellProto ? spellProto->Id : 0);
}
if (pVictim->GetTypeId() != TYPEID_PLAYER)