|
@@ -21,7 +21,6 @@ package com.l2jserver.gameserver.model.entity;
|
|
import java.io.BufferedReader;
|
|
import java.io.BufferedReader;
|
|
import java.io.FileReader;
|
|
import java.io.FileReader;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
-import java.util.Collections;
|
|
|
|
import java.util.Comparator;
|
|
import java.util.Comparator;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.LinkedHashMap;
|
|
import java.util.LinkedHashMap;
|
|
@@ -46,7 +45,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
|
|
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
|
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
|
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
|
|
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
|
|
import com.l2jserver.gameserver.model.holders.PlayerEventHolder;
|
|
import com.l2jserver.gameserver.model.holders.PlayerEventHolder;
|
|
-import com.l2jserver.gameserver.model.interfaces.IProcedure;
|
|
|
|
import com.l2jserver.gameserver.network.serverpackets.CharInfo;
|
|
import com.l2jserver.gameserver.network.serverpackets.CharInfo;
|
|
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
|
|
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
|
|
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
|
|
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
|
|
@@ -209,20 +207,16 @@ public class L2Event
|
|
*/
|
|
*/
|
|
public static void unspawnEventNpcs()
|
|
public static void unspawnEventNpcs()
|
|
{
|
|
{
|
|
- SpawnTable.getInstance().forEachSpawn(new IProcedure<L2Spawn, Boolean>()
|
|
|
|
|
|
+ SpawnTable.getInstance().forEachSpawn(spawn ->
|
|
{
|
|
{
|
|
- @Override
|
|
|
|
- public Boolean execute(L2Spawn spawn)
|
|
|
|
|
|
+ L2Npc npc = spawn.getLastSpawn();
|
|
|
|
+ if ((npc != null) && npc.isEventMob())
|
|
{
|
|
{
|
|
- L2Npc npc = spawn.getLastSpawn();
|
|
|
|
- if ((npc != null) && npc.isEventMob())
|
|
|
|
- {
|
|
|
|
- npc.deleteMe();
|
|
|
|
- spawn.stopRespawn();
|
|
|
|
- SpawnTable.getInstance().deleteSpawn(spawn, false);
|
|
|
|
- }
|
|
|
|
- return true;
|
|
|
|
|
|
+ npc.deleteMe();
|
|
|
|
+ spawn.stopRespawn();
|
|
|
|
+ SpawnTable.getInstance().deleteSpawn(spawn, false);
|
|
}
|
|
}
|
|
|
|
+ return true;
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -550,14 +544,8 @@ public class L2Event
|
|
private static final Map<L2PcInstance, Integer> sortByValue(Map<L2PcInstance, Integer> unsortMap)
|
|
private static final Map<L2PcInstance, Integer> sortByValue(Map<L2PcInstance, Integer> unsortMap)
|
|
{
|
|
{
|
|
final List<Entry<L2PcInstance, Integer>> list = new LinkedList<>(unsortMap.entrySet());
|
|
final List<Entry<L2PcInstance, Integer>> list = new LinkedList<>(unsortMap.entrySet());
|
|
- Collections.sort(list, new Comparator<Entry<L2PcInstance, Integer>>()
|
|
|
|
- {
|
|
|
|
- @Override
|
|
|
|
- public int compare(Entry<L2PcInstance, Integer> e1, Entry<L2PcInstance, Integer> e2)
|
|
|
|
- {
|
|
|
|
- return e1.getValue().compareTo(e2.getValue());
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+
|
|
|
|
+ list.sort(Comparator.comparing(Entry<L2PcInstance, Integer>::getValue));
|
|
|
|
|
|
final Map<L2PcInstance, Integer> sortedMap = new LinkedHashMap<>();
|
|
final Map<L2PcInstance, Integer> sortedMap = new LinkedHashMap<>();
|
|
for (Entry<L2PcInstance, Integer> entry : list)
|
|
for (Entry<L2PcInstance, Integer> entry : list)
|