Removed stream usage from CriticalRate effect.

This commit is contained in:
MobiusDevelopment
2023-01-08 13:06:55 +00:00
parent c38dcc2b28
commit 9affd41455
26 changed files with 520 additions and 286 deletions

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}

View File

@@ -18,11 +18,12 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public class CriticalRate extends AbstractConditionalHpEffect
{
@@ -34,8 +35,17 @@ public class CriticalRate extends AbstractConditionalHpEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
for (Condition cond : _conditions)
{
if (!cond.test(effected, effected, skill))
{
return;
}
}
}
switch (_mode)
{
case DIFF:
@@ -51,4 +61,3 @@ public class CriticalRate extends AbstractConditionalHpEffect
}
}
}
}