Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
This commit is contained in:
commit
fb465c6953
93 files changed
+2386
-119
No files matched your search
@@ -1908,6 +1908,11 @@ void SpellMgr::LoadSpellProcs()
|
||||
case SPELL_AURA_MOD_BLOCK_PERCENT:
|
||||
procEntry.HitMask = PROC_HIT_BLOCK;
|
||||
break;
|
||||
// proc auras with another aura reducing hit chance (eg 63767) only proc on missed attack
|
||||
case SPELL_AURA_MOD_HIT_CHANCE:
|
||||
if (spellInfo->Effects[i].CalcValue() <= -100)
|
||||
procEntry.HitMask = PROC_HIT_MISS;
|
||||
break;
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
@@ -2804,6 +2809,17 @@ void SpellMgr::LoadSpellInfoCustomAttributes()
|
||||
spellInfo->_InitializeExplicitTargetMask();
|
||||
}
|
||||
|
||||
// add custom attribute to liquid auras
|
||||
for (LiquidTypeEntry const* liquid : sLiquidTypeStore)
|
||||
{
|
||||
if (liquid->SpellId)
|
||||
{
|
||||
spellInfo = _GetSpellInfo(liquid->SpellId);
|
||||
if (spellInfo)
|
||||
spellInfo->AttributesCu |= SPELL_ATTR0_CU_LIQUID_AURA;
|
||||
}
|
||||
}
|
||||
|
||||
TC_LOG_INFO("server.loading", ">> Loaded SpellInfo custom attributes in %u ms", GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user