Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
# Conflicts: # src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
commit
f6d3b214c2
44 files changed
+711
-425
No files matched your search
@@ -1818,6 +1818,7 @@ void SpellMgr::LoadSpellProcs()
|
||||
|
||||
bool addTriggerFlag = false;
|
||||
uint32 procSpellTypeMask = PROC_SPELL_TYPE_NONE;
|
||||
uint32 nonProcMask = 0;
|
||||
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
|
||||
{
|
||||
if (!spellInfo->Effects[i].IsEffect())
|
||||
@@ -1828,7 +1829,11 @@ void SpellMgr::LoadSpellProcs()
|
||||
continue;
|
||||
|
||||
if (!isTriggerAura[auraName])
|
||||
{
|
||||
// explicitly disable non proccing auras to avoid losing charges on self proc
|
||||
nonProcMask |= 1 << i;
|
||||
continue;
|
||||
}
|
||||
|
||||
procSpellTypeMask |= spellTypeMask[auraName];
|
||||
if (isAlwaysTriggeredAura[auraName])
|
||||
@@ -1848,7 +1853,6 @@ void SpellMgr::LoadSpellProcs()
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (!procSpellTypeMask)
|
||||
@@ -1911,6 +1915,8 @@ void SpellMgr::LoadSpellProcs()
|
||||
procEntry.AttributesMask |= PROC_ATTR_REQ_EXP_OR_HONOR;
|
||||
if (addTriggerFlag)
|
||||
procEntry.AttributesMask |= PROC_ATTR_TRIGGERED_CAN_PROC;
|
||||
if (nonProcMask)
|
||||
procEntry.AttributesMask |= nonProcMask * PROC_ATTR_DISABLE_EFF_0;
|
||||
|
||||
procEntry.ProcsPerMinute = 0;
|
||||
procEntry.Chance = spellInfo->ProcChance;
|
||||
@@ -4461,11 +4467,16 @@ void SpellMgr::LoadSpellInfoCorrections()
|
||||
if (spellInfo->IsPassive() && GetTalentSpellCost(i))
|
||||
if (spellInfo->Effects[j].TargetA.GetTarget() == TARGET_UNIT_PET)
|
||||
spellInfo->Effects[j].TargetA = SpellImplicitTargetInfo(TARGET_UNIT_CASTER);
|
||||
|
||||
if (spellInfo->Effects[j].TargetA.GetSelectionCategory() == TARGET_SELECT_CATEGORY_CONE || spellInfo->Effects[j].TargetB.GetSelectionCategory() == TARGET_SELECT_CATEGORY_CONE)
|
||||
if (G3D::fuzzyEq(spellInfo->ConeAngle, 0.f))
|
||||
spellInfo->ConeAngle = 90.f;
|
||||
}
|
||||
// Area auras may not target area (they're self cast)
|
||||
if (spellInfo->Effects[j].IsAreaAuraEffect() && spellInfo->Effects[j].IsTargetingArea())
|
||||
{
|
||||
spellInfo->Effects[j].TargetA = SpellImplicitTargetInfo(TARGET_UNIT_CASTER);
|
||||
spellInfo->Effects[j].TargetB = SpellImplicitTargetInfo(0);
|
||||
}
|
||||
}
|
||||
|
||||
// disable proc for magnet auras, they're handled differently
|
||||
if (spellInfo->HasAura(SPELL_AURA_SPELL_MAGNET))
|
||||
@@ -4500,6 +4511,9 @@ void SpellMgr::LoadSpellInfoCorrections()
|
||||
if (SummonPropertiesEntry* properties = const_cast<SummonPropertiesEntry*>(sSummonPropertiesStore.LookupEntry(628))) // Hungry Plaguehound
|
||||
properties->Category = SUMMON_CATEGORY_PET;
|
||||
|
||||
if (LockEntry* entry = const_cast<LockEntry*>(sLockStore.LookupEntry(36))) // 3366 Opening, allows to open without proper key
|
||||
entry->Type[2] = LOCK_KEY_NONE;
|
||||
|
||||
TC_LOG_INFO("server.loading", ">> Loaded SpellInfo corrections in %u ms", GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user