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

Removed stream usage from BlockActions effect.

Browse Source
This commit is contained in:
MobiusDevelopment 2023-01-08 11:51:53 +00:00
parent 8226d405fc
commit 003a68a7e1
52 changed files with 572 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5574,12 +5574,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5574,12 +5574,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5574,12 +5574,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5574,12 +5574,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5583,12 +5583,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5583,12 +5583,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5583,12 +5583,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5582,12 +5582,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5582,12 +5582,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5582,12 +5582,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5592,12 +5592,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5592,12 +5592,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5562,12 +5562,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5562,12 +5562,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5562,12 +5562,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5562,12 +5562,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5571,12 +5571,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5596,12 +5596,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5596,12 +5596,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5596,12 +5596,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5595,12 +5595,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5562,12 +5562,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5608,12 +5608,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5627,12 +5627,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5647,12 +5647,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}

27
L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -16,9 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -37,12 +36,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/
public class BlockActions extends AbstractEffect
{
private final Set<Integer> _allowedSkills;
private final Set<Integer> _allowedSkills = new HashSet<>();
public BlockActions(StatSet params)
{
final String[] allowedSkills = params.getString("allowedSkills", "").split(";");
_allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet());
for (String skill : params.getString("allowedSkills", "").split(";"))
{
if (!skill.isEmpty())
{
_allowedSkills.add(Integer.parseInt(skill));
}
}
}
@Override
@ -65,8 +69,13 @@ public class BlockActions extends AbstractEffect
return;
}
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.addBlockActionsAllowedSkill(skillId);
}
effected.startParalyze();
// Cancel running skill casters.
effected.abortAllSkillCasters();
}
@ -74,7 +83,11 @@ public class BlockActions extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
_allowedSkills.stream().forEach(effected::removeBlockActionsAllowedSkill);
for (Integer skillId : _allowedSkills)
{
effected.removeBlockActionsAllowedSkill(skillId);
}
if (effected.isPlayable())
{
if (effected.isSummon())

4
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -5647,12 +5647,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _effectList.hasAbnormalType(abnormalType);
}
public void addBlockActionsAllowedSkill(int skillId)
public void addBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
}
public void removeBlockActionsAllowedSkill(int skillId)
public void removeBlockActionsAllowedSkill(Integer skillId)
{
_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
}