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

@@ -3153,7 +3153,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
*/
public void resetCurrentAbnormalVisualEffects()
{
final Collection<BuffInfo> passives = getEffectList().hasPassives() ? new ArrayList<>(getEffectList().getPassives().values()) : null;
final Collection<BuffInfo> passives = getEffectList().hasPassives() ? new ArrayList<>(getEffectList().getPassives()) : null;
//@formatter:off
final Set<AbnormalVisualEffect> abnormalVisualEffects = Stream.concat(getEffectList().getEffects().stream(), passives != null ? passives.stream() : Stream.empty())
.filter(Objects::nonNull)

View File

@@ -100,7 +100,7 @@ public final class CubicAction implements Runnable
boolean useCubicCure = false;
if (((_cubic.getId() >= L2CubicInstance.SMART_CUBIC_EVATEMPLAR) && (_cubic.getId() <= L2CubicInstance.SMART_CUBIC_SPECTRALMASTER)) || (_cubic.getId() == L2CubicInstance.AVENGING_CUBIC))
{
for (BuffInfo info : _cubic.getOwner().getEffectList().getDebuffs().values())
for (BuffInfo info : _cubic.getOwner().getEffectList().getDebuffs())
{
if (info.getSkill().canBeDispeled())
{