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

Removed stream usage from Op2hWeaponSkillCondition.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-08 13:23:39 +00:00
parent f1cf75d6e7
commit e751bfbd47
25 changed files with 450 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java vendored
View File

@@ -16,8 +16,9 @@
*/
package handlers.skillconditionhandlers;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill;
/**
* @author UnAfraid
* @author UnAfraid, Mobius
*/
public class Op2hWeaponSkillCondition implements ISkillCondition
{
private final List<WeaponType> _weaponTypes = new ArrayList<>();
private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
public Op2hWeaponSkillCondition(StatSet params)
{
final List<String> weaponTypes = params.getList("weaponType", String.class);
if (weaponTypes != null)
{
weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
for (String type : weaponTypes)
{
_weaponTypes.add(WeaponType.valueOf(type));
}
}
}
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
{
return false;
}
return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
for (WeaponType weaponType : _weaponTypes)
{
if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
{
return true;
}
}
return false;
}
}