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

Removed stream usage from RangeSortByHp affect scope.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-08 13:50:02 +00:00
parent f8cd0bf1e0
commit 022c9d5028
26 changed files with 468 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override

25
L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/RangeSortByHp.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package handlers.targethandlers.affectscope; package handlers.targethandlers.affectscope;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -33,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
/** /**
* Range sorted by lowest to highest hp percent affect scope implementation. * Range sorted by lowest to highest hp percent affect scope implementation.
* @author Nik * @author Nik, Mobius
*/ */
public class RangeSortByHp implements IAffectScopeHandler public class RangeSortByHp implements IAffectScopeHandler
{ {
@@ -82,12 +84,21 @@ public class RangeSortByHp implements IAffectScopeHandler
} }
// Sort from lowest hp to highest hp. // Sort from lowest hp to highest hp.
//@formatter:off final List<Creature> sortedList = new ArrayList<>(result);
result.stream() Collections.sort(sortedList, Comparator.comparingInt(Creature::getCurrentHpPercent));
.sorted(Comparator.comparingInt(Creature::getCurrentHpPercent))
.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE) int count = 0;
.forEach(action); final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
//@formatter:on for (Creature c : sortedList)
{
if (count >= limit)
{
break;
}
count++;
action.accept(c);
}
} }
@Override @Override