Reverting last CharEffectList changes.

This commit is contained in:
MobiusDev
2015-12-10 20:50:21 +00:00
parent 62a97d3de0
commit 692e9700ef
6 changed files with 138 additions and 141 deletions

View File

@@ -2041,14 +2041,14 @@ public final class Formulas
}
// Prevent initialization.
final List<BuffInfo> buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs().values()) : new ArrayList<>(1);
final List<BuffInfo> buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(1);
if (target.getEffectList().hasTriggered())
{
buffs.addAll(target.getEffectList().getTriggered().values());
buffs.addAll(target.getEffectList().getTriggered());
}
if (target.getEffectList().hasDances())
{
buffs.addAll(target.getEffectList().getDances().values());
buffs.addAll(target.getEffectList().getDances());
}
for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
{
@@ -2067,7 +2067,7 @@ public final class Formulas
}
case "debuff":
{
final List<BuffInfo> debuffs = new ArrayList<>(target.getEffectList().getDebuffs().values());
final List<BuffInfo> debuffs = new ArrayList<>(target.getEffectList().getDebuffs());
for (int i = debuffs.size() - 1; i >= 0; i--)
{
BuffInfo info = debuffs.get(i);