Removed stream usage from AbstractStatEffect.

This commit is contained in:
MobiusDevelopment
2023-01-08 13:11:39 +00:00
parent 9affd41455
commit 4bf8062fd4
26 changed files with 494 additions and 286 deletions

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
/** /**
* @author Sdw * @author Sdw, Mobius
*/ */
public abstract class AbstractStatEffect extends AbstractEffect public abstract class AbstractStatEffect extends AbstractEffect
{ {
@@ -111,8 +111,17 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override @Override
public void pump(Creature effected, Skill skill) 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) switch (_mode)
{ {
case DIFF: case DIFF:
@@ -127,5 +136,4 @@ public abstract class AbstractStatEffect extends AbstractEffect
} }
} }
} }
}
} }