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

Fixed incorrect Instance getAliveNpcs count.

Browse Source
This commit is contained in:
MobiusDev
2016-12-19 18:23:15 +00:00
parent 106fdd6c93
commit 3b16d9b270
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@@ -549,7 +549,7 @@ public final class Instance implements IIdentifiable, INamable
*/
public Set<L2Npc> getAliveNpcs()
{
return _npcs.stream().filter(n -> !n.isDead()).collect(Collectors.toSet());
return _npcs.stream().filter(n -> n.getCurrentHp() > 0).collect(Collectors.toSet());
}
/**
@@ -585,7 +585,7 @@ public final class Instance implements IIdentifiable, INamable
@SafeVarargs
public final <T extends L2Character> List<T> getAliveNpcs(Class<T> clazz, int... ids)
{
return _npcs.stream().filter(n -> ((ids.length == 0) || CommonUtil.contains(ids, n.getId())) && !n.isDead()).filter(clazz::isInstance).map(clazz::cast).collect(Collectors.toList());
return _npcs.stream().filter(n -> ((ids.length == 0) || CommonUtil.contains(ids, n.getId())) && (n.getCurrentHp() > 0)).filter(clazz::isInstance).map(clazz::cast).collect(Collectors.toList());
}
/**
@@ -595,7 +595,7 @@ public final class Instance implements IIdentifiable, INamable
*/
public List<L2Npc> getAliveNpcs(int... id)
{
return _npcs.stream().filter(n -> !n.isDead() && CommonUtil.contains(id, n.getId())).collect(Collectors.toList());
return _npcs.stream().filter(n -> (n.getCurrentHp() > 0) && CommonUtil.contains(id, n.getId())).collect(Collectors.toList());
}
/**