*Update to Trinity 759.
--HG-- branch : trunk
This commit is contained in:
commit
3deefb9f00
19 files changed
+813
-65
No files matched your search
+3
-2
@@ -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
|
||||
|
||||
Reference in new issue
Block a user