Merge branch 'master' into auras

This commit is contained in:
Michael Cook (mackal)
2017-07-22 15:47:08 -04:00
3 changed files with 5 additions and 3 deletions
-2
View File
@@ -173,7 +173,5 @@ void Mob::CalculateNewFearpoint()
}
if (currently_fleeing)
m_FearWalkTarget = glm::vec3(ranx, rany, ranz);
else //Break fear
BuffFadeByEffect(SE_Fear);
}
+1 -1
View File
@@ -3644,7 +3644,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster)
case SE_Fear: {
if (zone->random.Roll(RuleI(Spells, FearBreakCheckChance))) {
float resist_check = ResistSpell(spells[buff.spellid].resisttype, buff.spellid, caster);
float resist_check = ResistSpell(spells[buff.spellid].resisttype, buff.spellid, caster,0,0,true);
if (resist_check == 100)
break;