diff options
| author | megamage <none@none> | 2009-01-02 10:35:19 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-02 10:35:19 -0600 |
| commit | 3deefb9f00201033728d4467180d8ba9aa265a20 (patch) | |
| tree | dcd243f7f2f27f03e8c1f1d74e42aac332e508d8 /src/game/Unit.cpp | |
| parent | 75f0da72eea3ab2f8a6b5a2a9bc8361c4a656afe (diff) | |
| parent | deac8370d71c0f72b5d60709c09dc2830c1680bd (diff) | |
*Update to Trinity 759.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5526e3a7002..93cfb963b00 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7612,7 +7612,8 @@ uint32 Unit::SpellHealingBonus(SpellEntry const *spellProto, uint32 healamount, if (spellProto->Id == 15290 || spellProto->Id == 39373 || spellProto->Id == 33778 || spellProto->Id == 379 || spellProto->Id == 38395 || spellProto->Id == 40972 || - spellProto->Id == 22845 || spellProto->Id == 33504) + spellProto->Id == 22845 || spellProto->Id == 33504 || + spellProto->Id == 34299) return healamount; int32 AdvertisedBenefit = SpellBaseHealingBonus(GetSpellSchoolMask(spellProto)); @@ -8238,7 +8239,7 @@ void Unit::SetInCombatWith(Unit* enemy) void Unit::CombatStart(Unit* target) { - if(!target->IsStandState() && !target->hasUnitState(UNIT_STAT_STUNNED)) + if(!target->IsStandState()/* && !target->hasUnitState(UNIT_STAT_STUNNED)*/) target->SetStandState(PLAYER_STATE_NONE); //Call creature group update |