Removed stream usage from OpExistNpcSkillCondition.

This commit is contained in:
MobiusDevelopment 2023-01-08 13:28:37 +00:00
parent e7a042ec3a
commit fdd8d2631b
26 changed files with 234 additions and 78 deletions

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }

View File

@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
/** /**
* @author UnAfraid * @author UnAfraid, Mobius
*/ */
public class OpExistNpcSkillCondition implements ISkillCondition public class OpExistNpcSkillCondition implements ISkillCondition
{ {
@ -45,7 +45,13 @@ public class OpExistNpcSkillCondition implements ISkillCondition
@Override @Override
public boolean canUse(Creature caster, Skill skill, WorldObject target) public boolean canUse(Creature caster, Skill skill, WorldObject target)
{ {
final List<Npc> npcs = World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range); for (Npc npc : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, _range))
return _isAround == npcs.stream().anyMatch(npc -> _npcIds.contains(npc.getId())); {
if (_npcIds.contains(npc.getId()))
{
return _isAround;
}
}
return !_isAround;
} }
} }