Removed stream usage from OpTargetWeaponAttackTypeSkillCondition.

This commit is contained in:
MobiusDevelopment
2023-01-08 13:45:52 +00:00
parent 53ce9b5233
commit f8cd0bf1e0
26 changed files with 182 additions and 78 deletions

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }

View File

@@ -16,8 +16,9 @@
*/ */
package handlers.skillconditionhandlers; package handlers.skillconditionhandlers;
import java.util.ArrayList; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -32,14 +33,17 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
{ {
private final List<WeaponType> _weaponTypes = new ArrayList<>(); private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public OpTargetWeaponAttackTypeSkillCondition(StatSet params) public OpTargetWeaponAttackTypeSkillCondition(StatSet params)
{ {
final List<String> weaponTypes = params.getList("weaponType", String.class); final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null) if (weaponTypes != null)
{ {
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add); for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
} }
} }