diff options
| author | Shocker <shocker@freakz.ro> | 2011-11-26 10:37:22 -0800 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-11-26 10:37:22 -0800 |
| commit | 01d44a83e37d74de0a9abb97c84a492d315bbc3c (patch) | |
| tree | b28fce43a9dde52da35ab8830b42e0f15149b9f0 | |
| parent | 68e5a96312f082956f241ed82af1899c03f5702c (diff) | |
| parent | f9b0cdd4f80f2ea3f2a4c42380a839e1665ee6f4 (diff) | |
Merge pull request #4041 from PKX/remove_obsolete
Remove obsolete code and spell_groups
| -rw-r--r-- | sql/updates/world/2011_11_23_00_world_spell_group.sql | 7 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 28 |
2 files changed, 7 insertions, 28 deletions
diff --git a/sql/updates/world/2011_11_23_00_world_spell_group.sql b/sql/updates/world/2011_11_23_00_world_spell_group.sql new file mode 100644 index 00000000000..f7258dc882f --- /dev/null +++ b/sql/updates/world/2011_11_23_00_world_spell_group.sql @@ -0,0 +1,7 @@ +-- Blessing of Sanctuary + Grace +DELETE FROM `spell_group` WHERE `id`>=1091 AND `id`<=1093 LIMIT 4; +DELETE FROM `spell_group_stack_rules` WHERE `group_id`=1093 LIMIT 1; + +-- Ebon Plague + Curse of Elements + Earth and Moon +DELETE FROM `spell_group` WHERE `id`>=1040 AND `id`<=1043 LIMIT 6; +DELETE FROM `spell_group_stack_rules` WHERE `group_id`=1043 LIMIT 1;
\ No newline at end of file diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 54686fda0ed..5a9456be6c8 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10901,12 +10901,6 @@ bool Unit::isSpellCrit(Unit* victim, SpellInfo const* spellProto, SpellSchoolMas if (victim->HasAura(6788)) crit_chance+=(*i)->GetAmount(); break; - case 21: // Test of Faith - case 6935: - case 6918: - if (victim->HealthBelowPct(50)) - crit_chance+=(*i)->GetAmount(); - break; default: break; } @@ -11131,11 +11125,6 @@ uint32 Unit::SpellHealingBonus(Unit* victim, SpellInfo const* spellProto, uint32 case 3736: // Hateful Totem of the Third Wind / Increased Lesser Healing Wave / LK Arena (4/5/6) Totem of the Third Wind / Savage Totem of the Third Wind DoneTotal += (*i)->GetAmount(); break; - case 7997: // Renewed Hope - case 7998: - if (victim->HasAura(6788)) - AddPctN(DoneTotalMod, (*i)->GetAmount()); - break; case 21: // Test of Faith case 6935: case 6918: @@ -11760,23 +11749,6 @@ void Unit::MeleeDamageBonus(Unit* victim, uint32 *pdamage, WeaponAttackType attT AddPctF(TakenTotalMod, std::max(mod, float((*i)->GetAmount()))); } break; - // Blessing of Sanctuary - // Greater Blessing of Sanctuary - case 19: - case 1804: - { - if ((*i)->GetSpellInfo()->SpellFamilyName != SPELLFAMILY_PALADIN) - continue; - - if ((*i)->GetMiscValue() & (spellProto ? spellProto->GetSchoolMask() : 0)) - AddPctN(TakenTotalMod, (*i)->GetAmount()); - break; - } - // Ebon Plague - case 1933: - if ((*i)->GetMiscValue() & (spellProto ? spellProto->GetSchoolMask() : 0)) - AddPctN(TakenTotalMod, (*i)->GetAmount()); - break; } } |