*Mangos [7042] Fixed typo in SpellMgr::GetSpellAllowedInLocationError. This should fix problems with flasks and elixirs using. By Turk3y.

*Mangos [7043] Remove not need code. By DiSlord.
*Mangos [7044] Fix some priest spell (48110, 48111, 48112, 48113) crash. By DiSlord.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-07 11:41:53 -06:00
parent caac00a2ab
commit fd07b66887
5 changed files with 23 additions and 16 deletions
@@ -0,0 +1,17 @@
ALTER TABLE db_version CHANGE COLUMN required_7040_01_mangos_achievement_reward required_7044_01_mangos_spell_proc_event bit;
-- (48110) Prayer of Mending (Rank 2)
DELETE FROM `spell_proc_event` WHERE `entry` IN (48110);
INSERT INTO `spell_proc_event` VALUES (48110, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0);
-- (48112) Prayer of Mending (Rank 2)
DELETE FROM `spell_proc_event` WHERE `entry` IN (48112);
INSERT INTO `spell_proc_event` VALUES (48112, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0);
-- (48111) Prayer of Mending (Rank 3)
DELETE FROM `spell_proc_event` WHERE `entry` IN (48111);
INSERT INTO `spell_proc_event` VALUES (48111, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0);
-- (48113) Prayer of Mending (Rank 3)
DELETE FROM `spell_proc_event` WHERE `entry` IN (48113);
INSERT INTO `spell_proc_event` VALUES (48113, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0);
+4
View File
@@ -6751,6 +6751,10 @@ INSERT INTO `spell_proc_event` VALUES
(47580, 0x00000000, 6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
(47581, 0x00000000, 6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
(47582, 0x00000000, 6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
(48110, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0),
(48111, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0),
(48112, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0),
(48113, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0.000000, 0.000000, 0),
(48159, 0x00000000, 6, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
(48160, 0x00000000, 6, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
(48483, 0x00000000, 7, 0x00008800, 0x00000440, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
-14
View File
@@ -3875,13 +3875,6 @@ void Aura::HandlePeriodicTriggerSpell(bool apply, bool Real)
m_isPeriodic = apply;
m_isTrigger = apply;
// Curse of the Plaguebringer
if (!apply && m_spellProto->Id == 29213 && m_removeMode!=AURA_REMOVE_BY_DISPEL)
{
// Cast Wrath of the Plaguebringer if not dispelled
m_target->CastSpell(m_target, 29214, true, 0, this);
}
}
void Aura::HandlePeriodicEnergize(bool apply, bool Real)
@@ -3899,13 +3892,6 @@ void Aura::HandlePeriodicHeal(bool apply, bool Real)
m_isPeriodic = apply;
// only at real apply
if (Real && apply && GetSpellProto()->Mechanic == MECHANIC_BANDAGE)
{
// provided m_target as original caster to prevent apply aura caster selection for this negative buff
m_target->CastSpell(m_target,11196,true,NULL,this,m_target->GetGUID());
}
// For prevent double apply bonuses
bool loading = (m_target->GetTypeId() == TYPEID_PLAYER && ((Player*)m_target)->GetSession()->PlayerLoading());
+1 -1
View File
@@ -2487,7 +2487,7 @@ uint8 GetSpellAllowedInLocationError(SpellEntry const *spellInfo,uint32 map_id,u
}
// elixirs not have another limitations
return true;
return 0;
}
}
+1 -1
View File
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "7041"
#define REVISION_NR "7044"
#endif // __REVISION_NR_H__