diff options
| author | Sebastian Valle Herrera <subv2112@gmail.com> | 2014-05-17 18:37:50 -0500 |
|---|---|---|
| committer | Sebastian Valle Herrera <subv2112@gmail.com> | 2014-05-17 18:37:50 -0500 |
| commit | d76da63a5aced4c55b01a9c64da98538c74a2064 (patch) | |
| tree | 009c53ce7f3f62c96992a318401e44ad7ac3e4a6 | |
| parent | 5e86dea0b06566bc643018fe8cc026d0dd24ad79 (diff) | |
| parent | 50336af1c74d188d1afd1911ca5886c547c83374 (diff) | |
Merge pull request #12070 from Trisjdc/more_sai
Core/SAI: Prevent nullifying damage, because of player damage requirements
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 098f3130fed..e769b7c22a5 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -618,10 +618,7 @@ void SmartAI::DamageTaken(Unit* doneBy, uint32& damage) { GetScript()->ProcessEventsFor(SMART_EVENT_DAMAGED, doneBy, damage); if (mInvincibilityHpLevel && (damage >= me->GetHealth() - mInvincibilityHpLevel)) - { - damage = 0; - me->SetHealth(mInvincibilityHpLevel); - } + damage = me->GetHealth() - mInvincibilityHpLevel; // damage should not be nullified, because of player damage req. } void SmartAI::HealReceived(Unit* doneBy, uint32& addhealth) |