lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed stream usage from AbstractStatEffect.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}

30
L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java vendored
View File

@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Sdw, Mobius
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
@ -111,21 +111,29 @@ public abstract class AbstractStatEffect extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
if (_conditions.isEmpty() || _conditions.stream().allMatch(cond -> cond.test(effected, effected, skill)))
if (!_conditions.isEmpty())
{
switch (_mode)
for (Condition cond : _conditions)
{
case DIFF:
if (!cond.test(effected, effected, skill))
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
return;
}
}
}
switch (_mode)
{
case DIFF:
{
effected.getStat().mergeAdd(_addStat, _amount);
break;
}
case PER:
{
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
break;
}
}
}
}