danbst

10x for trying fix the instance system!

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 0ace799..91a0f12 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2377,6 +2377,12 @@ void Spell::cast(bool skipCheck) m_preCastSpell = 57723; // Exhaustion break; } + case SPELLFAMILY_DEATHKNIGHT: + { + if (m_spellInfo->Id == 48263) + m_preCastSpell = 61261; + break; + } default: break; } diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 65c0a69..a40ed82 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -5597,6 +5597,13 @@ void Aura::CleanupTriggeredSpells() return; } + if (m_spellProto->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellProto->SpellFamilyFlags & 0x00008000LL && (m_spellProto->AttributesEx2 & 0x10) ) + { + // Frost Presence +10% max. health remove + m_target->RemoveAurasDueToSpell(61261); + return; + } + uint32 tSpellId = m_spellProto->EffectTriggerSpell[GetEffIndex()]; if(!tSpellId) return; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index edd592c..cb1eba3 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1443,6 +1443,15 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons if( spellInfo_1->Id == 2825 && spellInfo_2->SpellIconID == 38 && spellInfo_2->SpellVisual[0] == 0 ) return false; break; + case SPELLFAMILY_DEATHKNIGHT: + if (spellInfo_2->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT) + { + //Frost Presence -> +10% max. health or +10% max. health -> Frost Presence + if ((spellInfo_2->Id == 48263 && spellInfo_1->Id == 61261) || + (spellInfo_2->Id == 61261 && spellInfo_1->Id == 48263)) + return false; + } + break; default: break; } written by Astellar diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 65c0a69..0bc2914 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -4452,7 +4452,9 @@ void Aura::HandleAuraModBaseResistancePCT(bool apply, bool Real) } else { - for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++) + if (GetId() == 48263 && apply) + m_target->CastSpell(m_target,61261,true,NULL,this); + for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++) { if(m_modifier.m_miscvalue & int32(1<<x)) m_target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(m_modifier.m_amount), apply); @@ -5597,6 +5599,13 @@ void Aura::CleanupTriggeredSpells() return; } + if (m_spellProto->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellProto->SpellFamilyFlags & 0x00008000LL && (m_spellProto->AttributesEx2 & 0x10) ) + { + // Frost Presence +10% max. health remove + m_target->RemoveAurasDueToSpell(61261); + return; + } + uint32 tSpellId = m_spellProto->EffectTriggerSpell[GetEffIndex()]; if(!tSpellId) return; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index edd592c..cb1eba3 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1443,6 +1443,15 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons if( spellInfo_1->Id == 2825 && spellInfo_2->SpellIconID == 38 && spellInfo_2->SpellVisual[0] == 0 ) return false; break; + case SPELLFAMILY_DEATHKNIGHT: + if (spellInfo_2->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT) + { + //Frost Presence -> +10% max. health or +10% max. health -> Frost Presence + if ((spellInfo_2->Id == 48263 && spellInfo_1->Id == 61261) || + (spellInfo_2->Id == 61261 && spellInfo_1->Id == 48263)) + return false; + } + break; default: break; } One more variant by Astellar

Change check of SPELL_AURA_FLY. Will fix spells: 28622 (Web Wrap, used by Maexxna), 39432 (Gravity Lapse, used by Kael'thas), 55173 (flying form of wysp) + 51 other spells (maybe not full fix, but one more bug removed) Full list of spells using SPELL_AURA_FLY you can get by SELECT id, entry FROM wowd.wowd_spell WHERE EffectApplyAuraName_1=201 OR EffectApplyAuraName_2=201 OR EffectApplyAuraName_3=201 or here - http://thottbot.com/?e=Apply%20Aura%3A%20Cannot%20be%20Dodged#A::30 Copy post from getmangos.ru diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index d9c9722..a0c17b6 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4459,6 +4459,25 @@ SpellCastResult Spell::CheckCast(bool strict) break; } + //SPELL_AURA_FLY means player can fly without a mount. Here we check only for flying shapeshifting spells + //If spell is shapeshifting we will go to SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED check. + case SPELL_AURA_FLY: + { + if((m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_CAST_ONLY_IN_OUTLAND) == 0) + break;//Perhaps this is not a mount + } + //check for flying mounts. mount, that has SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED also has SPELL_AURA_MOUNTED + //exception is spell 49851, wich is Blizz internal and not used + case SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED: + { + // not allow cast mount spells at old maps by players (all spells are self target) + if(m_caster->GetTypeId() == TYPEID_PLAYER) + { + if( !((Player*)m_caster)->IsAllowUseFlyMountsHere() ) + return SPELL_FAILED_NOT_HERE; + } + break; + } case SPELL_AURA_MOUNTED: { if (m_caster->IsInWater()) @@ -4491,18 +4510,6 @@ SpellCastResult Spell::CheckCast(bool strict) break; } - case SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED: - case SPELL_AURA_FLY: - { - // not allow cast fly spells at old maps by players (all spells is self target) - if(m_caster->GetTypeId()==TYPEID_PLAYER) - { - if( !((Player*)m_caster)->IsAllowUseFlyMountsHere() ) - return SPELL_FAILED_NOT_HERE; - } - - break; - } case SPELL_AURA_PERIODIC_MANA_LEECH: { if (!m_targets.getUnitTarget()) Wish this will help someone =)

http://ftp.filekeeper.org/download/browser.php?path=insider%2FMangos5%2FCumulative%20Pack/ These are KarateJIb's patches. Realy not bad

some GO doesn't disappear after using but have to veins for example. you can dig them forever. i can use chests only once. they don't disappear, thus don't respawn UPDATE: f*ck, i was using GM mode ((( sorry, no problem