aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Battlegrounds/Battleground.cpp2
-rw-r--r--src/server/game/Entities/Player/Player.cpp4
-rw-r--r--src/server/game/Entities/Unit/StatSystem.cpp4
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp28
-rw-r--r--src/server/game/Entities/Unit/Unit.h65
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp129
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
-rw-r--r--src/server/scripts/Spells/spell_druid.cpp8
8 files changed, 121 insertions, 121 deletions
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index e96286692d2..8b5622331a8 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -1870,7 +1870,7 @@ uint32 Battleground::GetAlivePlayersCountByTeam(uint32 Team) const
if (itr->second.Team == Team)
{
Player* player = ObjectAccessor::FindPlayer(itr->first);
- if (player && player->IsAlive() && !player->HasByteFlag(UNIT_FIELD_BYTES_2, 3, FORM_SPIRITOFREDEMPTION))
+ if (player && player->IsAlive() && !player->HasByteFlag(UNIT_FIELD_BYTES_2, 3, FORM_SPIRIT_OF_REDEMPTION))
++count;
}
}
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 1aab9f001ed..d26ebcc9170 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -20888,13 +20888,13 @@ void Player::InitDataForForm(bool reapplyMods)
switch (form)
{
case FORM_GHOUL:
- case FORM_CAT:
+ case FORM_CAT_FORM:
{
if (getPowerType() != POWER_ENERGY)
setPowerType(POWER_ENERGY);
break;
}
- case FORM_BEAR:
+ case FORM_BEAR_FORM:
{
if (getPowerType() != POWER_RAGE)
setPowerType(POWER_RAGE);
diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
index 4fa79a91eee..397a4b993db 100644
--- a/src/server/game/Entities/Unit/StatSystem.cpp
+++ b/src/server/game/Entities/Unit/StatSystem.cpp
@@ -417,12 +417,12 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bo
if (Item* weapon = GetWeaponForAttack(BASE_ATTACK, true))
weaponSpeed = weapon->GetTemplate()->GetDelay() / 1000;
- if (GetShapeshiftForm() == FORM_CAT)
+ if (GetShapeshiftForm() == FORM_CAT_FORM)
{
weaponMinDamage = weaponMinDamage / weaponSpeed;
weaponMaxDamage = weaponMaxDamage / weaponSpeed;
}
- else if (GetShapeshiftForm() == FORM_BEAR)
+ else if (GetShapeshiftForm() == FORM_BEAR_FORM)
{
weaponMinDamage = weaponMinDamage / weaponSpeed + weaponMinDamage / 2.5;
weaponMaxDamage = weaponMinDamage / weaponSpeed + weaponMaxDamage / 2.5;
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 8035b3411b7..87bdcf3692a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -6254,10 +6254,10 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
switch (GetShapeshiftForm())
{
case FORM_NONE: trigger_spell_id = 37344; break;
- case FORM_CAT: trigger_spell_id = 37341; break;
- case FORM_BEAR: trigger_spell_id = 37340; break;
- case FORM_TREE: trigger_spell_id = 37342; break;
- case FORM_MOONKIN: trigger_spell_id = 37343; break;
+ case FORM_CAT_FORM: trigger_spell_id = 37341; break;
+ case FORM_BEAR_FORM: trigger_spell_id = 37340; break;
+ case FORM_TREE_OF_LIFE: trigger_spell_id = 37342; break;
+ case FORM_MOONKIN_FORM: trigger_spell_id = 37343; break;
default:
return false;
}
@@ -6268,8 +6268,8 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
{
switch (GetShapeshiftForm())
{
- case FORM_CAT: trigger_spell_id = 67355; break;
- case FORM_BEAR: trigger_spell_id = 67354; break;
+ case FORM_CAT_FORM: trigger_spell_id = 67355; break;
+ case FORM_BEAR_FORM: trigger_spell_id = 67354; break;
default:
return false;
}
@@ -10732,7 +10732,7 @@ void Unit::SetShapeshiftForm(ShapeshiftForm form)
bool Unit::IsInFeralForm() const
{
ShapeshiftForm form = GetShapeshiftForm();
- return form == FORM_CAT || form == FORM_BEAR;
+ return form == FORM_CAT_FORM || form == FORM_BEAR_FORM;
}
bool Unit::IsInDisallowedMountForm() const
@@ -13183,7 +13183,7 @@ void Unit::Kill(Unit* victim, bool durabilityLoss)
// restore for use at real death
victim->SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId);
- // FORM_SPIRITOFREDEMPTION and related auras
+ // FORM_SPIRIT_OF_REDEMPTION and related auras
victim->CastSpell(victim, 27827, true, NULL, aurEff);
spiritOfRedemption = true;
break;
@@ -14271,7 +14271,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) const
{
switch (form)
{
- case FORM_CAT:
+ case FORM_CAT_FORM:
// Based on Hair color
if (getRace() == RACE_NIGHTELF)
{
@@ -14419,7 +14419,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) const
return 892;
else
return 8571;
- case FORM_BEAR:
+ case FORM_BEAR_FORM:
// Based on Hair color
if (getRace() == RACE_NIGHTELF)
{
@@ -14567,17 +14567,17 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) const
return 2281;
else
return 2289;
- case FORM_FLIGHT:
+ case FORM_FLIGHT_FORM:
if (Player::TeamForRace(getRace()) == ALLIANCE)
return 20857;
return 20872;
- case FORM_FLIGHT_EPIC:
+ case FORM_FLIGHT_FORM_EPIC:
if (Player::TeamForRace(getRace()) == ALLIANCE)
return (getRace() == RACE_WORGEN ? 37729 : 21243);
if (getRace() == RACE_TROLL)
return 37730;
return 21244;
- case FORM_MOONKIN:
+ case FORM_MOONKIN_FORM:
switch (getRace())
{
case RACE_NIGHTELF:
@@ -14592,7 +14592,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) const
break;
}
break;
- case FORM_GHOSTWOLF:
+ case FORM_GHOST_WOLF:
if (HasAura(58135)) //! Glyph of Arctic Wolf
return 27312;
default:
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 05149a4cd0a..48e7cb86fcf 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -260,37 +260,40 @@ enum UnitBytes1_Flags
// high byte (3 from 0..3) of UNIT_FIELD_BYTES_2
enum ShapeshiftForm
{
- FORM_NONE = 0x00,
- FORM_CAT = 0x01,
- FORM_TREE = 0x02,
- FORM_TRAVEL = 0x03,
- FORM_AQUA = 0x04,
- FORM_BEAR = 0x05,
- FORM_AMBIENT = 0x06,
- FORM_GHOUL = 0x07,
- FORM_DIREBEAR = 0x08, // Removed in 4.0.1
- FORM_STEVES_GHOUL = 0x09,
- FORM_THARONJA_SKELETON = 0x0A,
- FORM_TEST_OF_STRENGTH = 0x0B,
- FORM_BLB_PLAYER = 0x0C,
- FORM_SHADOW_DANCE = 0x0D,
- FORM_CREATUREBEAR = 0x0E,
- FORM_CREATURECAT = 0x0F,
- FORM_GHOSTWOLF = 0x10,
- FORM_BATTLESTANCE = 0x11,
- FORM_DEFENSIVESTANCE = 0x12,
- FORM_BERSERKERSTANCE = 0x13,
- FORM_TEST = 0x14,
- FORM_ZOMBIE = 0x15,
- FORM_METAMORPHOSIS = 0x16,
- FORM_UNDEAD = 0x19,
- FORM_MASTER_ANGLER = 0x1A,
- FORM_FLIGHT_EPIC = 0x1B,
- FORM_SHADOW = 0x1C,
- FORM_FLIGHT = 0x1D,
- FORM_STEALTH = 0x1E,
- FORM_MOONKIN = 0x1F,
- FORM_SPIRITOFREDEMPTION = 0x20
+ FORM_NONE = 0,
+ FORM_CAT_FORM = 1,
+ FORM_TREE_OF_LIFE = 2,
+ FORM_TRAVEL_FORM = 3,
+ FORM_AQUATIC_FORM = 4,
+ FORM_BEAR_FORM = 5,
+ FORM_AMBIENT = 6,
+ FORM_GHOUL = 7,
+ FORM_DIRE_BEAR_FORM = 8,
+ FORM_CRANE_STANCE = 9,
+ FORM_THARONJA_SKELETON = 10,
+ FORM_DARKMOON_TEST_OF_STRENGTH = 11,
+ FORM_BLB_PLAYER = 12,
+ FORM_SHADOW_DANCE = 13,
+ FORM_CREATURE_BEAR = 14,
+ FORM_CREATURE_CAT = 15,
+ FORM_GHOST_WOLF = 16,
+ FORM_BATTLE_STANCE = 17,
+ FORM_DEFENSIVE_STANCE = 18,
+ FORM_BERSERKER_STANCE = 19,
+ FORM_SERPENT_STANCE = 20,
+ FORM_ZOMBIE = 21,
+ FORM_METAMORPHOSIS = 22,
+ FORM_OX_STANCE = 23,
+ FORM_TIGER_STANCE = 24,
+ FORM_UNDEAD = 25,
+ FORM_FRENZY = 26,
+ FORM_FLIGHT_FORM_EPIC = 27,
+ FORM_SHADOWFORM = 28,
+ FORM_FLIGHT_FORM = 29,
+ FORM_STEALTH = 30,
+ FORM_MOONKIN_FORM = 31,
+ FORM_SPIRIT_OF_REDEMPTION = 32,
+ FORM_GLADIATOR_STANCE = 33
};
// low byte (0 from 0..3) of UNIT_FIELD_BYTES_2
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 34bd7e66ac2..f205ac03e01 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -1275,40 +1275,40 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const
switch (GetMiscValue())
{
- case FORM_CAT:
+ case FORM_CAT_FORM:
spellId = 3025;
break;
- case FORM_TREE:
+ case FORM_TREE_OF_LIFE:
spellId = 34123;
break;
- case FORM_TRAVEL:
+ case FORM_TRAVEL_FORM:
spellId = 5419;
break;
- case FORM_AQUA:
+ case FORM_AQUATIC_FORM:
spellId = 5421;
break;
- case FORM_BEAR:
+ case FORM_BEAR_FORM:
spellId = 1178;
spellId2 = 21178;
break;
- case FORM_BATTLESTANCE:
+ case FORM_BATTLE_STANCE:
spellId = 21156;
break;
- case FORM_DEFENSIVESTANCE:
+ case FORM_DEFENSIVE_STANCE:
spellId = 7376;
break;
- case FORM_BERSERKERSTANCE:
+ case FORM_BERSERKER_STANCE:
spellId = 7381;
break;
- case FORM_MOONKIN:
+ case FORM_MOONKIN_FORM:
spellId = 24905;
spellId2 = 24907;
break;
- case FORM_FLIGHT:
+ case FORM_FLIGHT_FORM:
spellId = 33948;
spellId2 = 34764;
break;
- case FORM_FLIGHT_EPIC:
+ case FORM_FLIGHT_FORM_EPIC:
spellId = 40122;
spellId2 = 40121;
break;
@@ -1316,21 +1316,19 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const
spellId = 54817;
spellId2 = 54879;
break;
- case FORM_SPIRITOFREDEMPTION:
+ case FORM_SPIRIT_OF_REDEMPTION:
spellId = 27792;
spellId2 = 27795; // must be second, this important at aura remove to prevent to early iterator invalidation.
break;
- case FORM_SHADOW:
+ case FORM_SHADOWFORM:
spellId = 49868;
break;
- case FORM_GHOSTWOLF:
+ case FORM_GHOST_WOLF:
spellId = 67116;
break;
case FORM_GHOUL:
case FORM_AMBIENT:
case FORM_STEALTH:
- case FORM_CREATURECAT:
- case FORM_CREATUREBEAR:
break;
default:
break;
@@ -1395,7 +1393,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const
switch (GetMiscValue())
{
- case FORM_CAT:
+ case FORM_CAT_FORM:
// Savage Roar
if (target->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, flag128(0, 0x10000000, 0)))
target->CastSpell(target, 62071, true);
@@ -1421,7 +1419,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const
target->CastCustomSpell(target, 48420, &bp, NULL, NULL, true);
}
break;
- case FORM_BEAR:
+ case FORM_BEAR_FORM:
// Master Shapeshifter - Bear
if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_HEALING_DONE_PERCENT, SPELLFAMILY_GENERIC, 2851, EFFECT_0))
{
@@ -1429,7 +1427,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const
target->CastCustomSpell(target, 48418, &bp, NULL, NULL, true);
}
break;
- case FORM_MOONKIN:
+ case FORM_MOONKIN_FORM:
// Master Shapeshifter - Moonkin
if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_HEALING_DONE_PERCENT, SPELLFAMILY_GENERIC, 2851, EFFECT_0))
{
@@ -1784,44 +1782,43 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo
switch (form)
{
- case FORM_CAT: // 0x01
- case FORM_GHOUL: // 0x07
+ case FORM_CAT_FORM:
+ case FORM_GHOUL:
+ case FORM_TIGER_STANCE:
+ case FORM_OX_STANCE:
PowerType = POWER_ENERGY;
break;
- case FORM_BEAR: // 0x05
+ case FORM_BEAR_FORM:
- case FORM_BATTLESTANCE: // 0x11
- case FORM_DEFENSIVESTANCE: // 0x12
- case FORM_BERSERKERSTANCE: // 0x13
+ case FORM_BATTLE_STANCE:
+ case FORM_DEFENSIVE_STANCE:
+ case FORM_BERSERKER_STANCE:
PowerType = POWER_RAGE;
break;
- case FORM_TREE: // 0x02
- case FORM_TRAVEL: // 0x03
- case FORM_AQUA: // 0x04
- case FORM_AMBIENT: // 0x06
-
- case FORM_STEVES_GHOUL: // 0x09
- case FORM_THARONJA_SKELETON: // 0x0A
- case FORM_TEST_OF_STRENGTH: // 0x0B
- case FORM_BLB_PLAYER: // 0x0C
- case FORM_SHADOW_DANCE: // 0x0D
- case FORM_CREATUREBEAR: // 0x0E
- case FORM_CREATURECAT: // 0x0F
- case FORM_GHOSTWOLF: // 0x10
-
- case FORM_TEST: // 0x14
- case FORM_ZOMBIE: // 0x15
- case FORM_METAMORPHOSIS: // 0x16
- case FORM_UNDEAD: // 0x19
- case FORM_MASTER_ANGLER: // 0x1A
- case FORM_FLIGHT_EPIC: // 0x1B
- case FORM_SHADOW: // 0x1C
- case FORM_FLIGHT: // 0x1D
- case FORM_STEALTH: // 0x1E
- case FORM_MOONKIN: // 0x1F
- case FORM_SPIRITOFREDEMPTION: // 0x20
+ case FORM_TREE_OF_LIFE:
+ case FORM_TRAVEL_FORM:
+ case FORM_AQUATIC_FORM:
+ case FORM_AMBIENT:
+
+ case FORM_THARONJA_SKELETON:
+ case FORM_DARKMOON_TEST_OF_STRENGTH:
+ case FORM_BLB_PLAYER:
+ case FORM_SHADOW_DANCE:
+ case FORM_CRANE_STANCE:
+ case FORM_GHOST_WOLF:
+
+ case FORM_SERPENT_STANCE:
+ case FORM_ZOMBIE:
+ case FORM_METAMORPHOSIS:
+ case FORM_UNDEAD:
+ case FORM_FLIGHT_FORM_EPIC:
+ case FORM_SHADOWFORM:
+ case FORM_FLIGHT_FORM:
+ case FORM_STEALTH:
+ case FORM_MOONKIN_FORM:
+ case FORM_SPIRIT_OF_REDEMPTION:
break;
default:
TC_LOG_ERROR("spells", "Auras: Unknown Shapeshift Type: %u", GetMiscValue());
@@ -1834,14 +1831,14 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo
// remove polymorph before changing display id to keep new display id
switch (form)
{
- case FORM_CAT:
- case FORM_TREE:
- case FORM_TRAVEL:
- case FORM_AQUA:
- case FORM_BEAR:
- case FORM_FLIGHT_EPIC:
- case FORM_FLIGHT:
- case FORM_MOONKIN:
+ case FORM_CAT_FORM:
+ case FORM_TREE_OF_LIFE:
+ case FORM_TRAVEL_FORM:
+ case FORM_AQUATIC_FORM:
+ case FORM_BEAR_FORM:
+ case FORM_FLIGHT_FORM_EPIC:
+ case FORM_FLIGHT_FORM:
+ case FORM_MOONKIN_FORM:
{
// remove movement affects
target->RemoveMovementImpairingAuras();
@@ -1869,14 +1866,14 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo
if (target->getPowerType() != PowerType)
target->setPowerType(PowerType);
- if (form == FORM_CAT || form == FORM_BEAR)
+ if (form == FORM_CAT_FORM || form == FORM_BEAR_FORM)
{
// get furor proc chance
int32 FurorChance = 0;
if (AuraEffect const* dummy = target->GetDummyAuraEffect(SPELLFAMILY_DRUID, 238, 0))
FurorChance = std::max(dummy->GetAmount(), 0);
- if (form == FORM_CAT)
+ if (form == FORM_CAT_FORM)
{
int32 basePoints = std::min<int32>(oldPower, FurorChance);
target->SetPower(POWER_ENERGY, 0);
@@ -1919,19 +1916,19 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo
switch (form)
{
// Nordrassil Harness - bonus
- case FORM_BEAR:
- case FORM_CAT:
+ case FORM_BEAR_FORM:
+ case FORM_CAT_FORM:
if (AuraEffect* dummy = target->GetAuraEffect(37315, 0))
target->CastSpell(target, 37316, true, NULL, dummy);
break;
// Nordrassil Regalia - bonus
- case FORM_MOONKIN:
+ case FORM_MOONKIN_FORM:
if (AuraEffect* dummy = target->GetAuraEffect(37324, 0))
target->CastSpell(target, 37325, true, NULL, dummy);
break;
- case FORM_BATTLESTANCE:
- case FORM_DEFENSIVESTANCE:
- case FORM_BERSERKERSTANCE:
+ case FORM_BATTLE_STANCE:
+ case FORM_DEFENSIVE_STANCE:
+ case FORM_BERSERKER_STANCE:
{
int32 Rage_val = 0;
// Stance mastery + Tactical mastery (both passive, and last have aura only in defense stance, but need apply at any stance switch)
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index e99c4bd661f..4e9a6363e8d 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3385,7 +3385,7 @@ void SpellMgr::LoadSpellInfoCorrections()
spellInfo->AuraInterruptFlags |= AURA_INTERRUPT_FLAG_CAST | AURA_INTERRUPT_FLAG_MOVE | AURA_INTERRUPT_FLAG_JUMP;
break;
case 5420: // Tree of Life (Passive)
- spellInfo->Stances = UI64LIT(1) << (FORM_TREE - 1);
+ spellInfo->Stances = UI64LIT(1) << (FORM_TREE_OF_LIFE - 1);
break;
case 49376: // Feral Charge (Cat Form)
spellInfo->AttributesEx3 &= ~SPELL_ATTR3_CANT_TRIGGER_PROC;
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 4488561589f..d82e9920df2 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -74,7 +74,7 @@ class spell_dru_dash : public SpellScriptLoader
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
// do not set speed if not in cat form
- if (GetUnitOwner()->GetShapeshiftForm() != FORM_CAT)
+ if (GetUnitOwner()->GetShapeshiftForm() != FORM_CAT_FORM)
amount = 0;
}
@@ -767,7 +767,7 @@ class spell_dru_savage_roar : public SpellScriptLoader
SpellCastResult CheckCast()
{
Unit* caster = GetCaster();
- if (caster->GetShapeshiftForm() != FORM_CAT)
+ if (caster->GetShapeshiftForm() != FORM_CAT_FORM)
return SPELL_FAILED_ONLY_SHAPESHIFT;
return SPELL_CAST_OK;
@@ -889,7 +889,7 @@ class spell_dru_stampede : public SpellScriptLoader
void HandleEffectCatProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
- if (GetTarget()->GetShapeshiftForm() != FORM_CAT || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_CAT)
+ if (GetTarget()->GetShapeshiftForm() != FORM_CAT_FORM || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_CAT)
return;
GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_CAT_RANK_1, GetSpellInfo()->GetRank()), true, NULL, aurEff);
@@ -899,7 +899,7 @@ class spell_dru_stampede : public SpellScriptLoader
void HandleEffectBearProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
- if (GetTarget()->GetShapeshiftForm() != FORM_BEAR || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_BEAR)
+ if (GetTarget()->GetShapeshiftForm() != FORM_BEAR_FORM || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_BEAR)
return;
GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_BAER_RANK_1, GetSpellInfo()->GetRank()), true, NULL, aurEff);