Merge branch 'master' into 4.x
This commit is contained in:
commit
9f635ca906
40 files changed
+1865
-303
No files matched your search
@@ -2378,6 +2378,19 @@ bool SpellInfo::_IsPositiveEffect(uint8 effIndex, bool deep) const
|
||||
if (Id == 30708)
|
||||
return false;
|
||||
break;
|
||||
case SPELLFAMILY_ROGUE:
|
||||
switch (Id)
|
||||
{
|
||||
// Envenom must be considered as a positive effect even though it deals damage
|
||||
case 32645: // Envenom (Rank 1)
|
||||
case 32684: // Envenom (Rank 2)
|
||||
case 57992: // Envenom (Rank 3)
|
||||
case 57993: // Envenom (Rank 4)
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -2675,4 +2688,4 @@ SpellCooldownsEntry const* SpellInfo::GetSpellCooldowns() const
|
||||
SpellEffectEntry const* SpellEntry::GetSpellEffect(uint32 eff) const
|
||||
{
|
||||
return GetSpellEffectEntry(Id, eff);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user