From fe286e1a319147a4aeb87f74fa50439231bcd635 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Wed, 30 May 2012 17:46:26 +0000
Subject: [PATCH] BETA: Using same warning settings than core and fixed some
related warnings. * Other warnings will be fixed later.
---
.../.settings/org.eclipse.jdt.core.prefs | 4 +--
.../scripts/ai/group_template/BeastFarm.java | 8 ++---
.../ai/group_template/EnergySeeds.java | 2 +-
.../ai/group_template/FeedableBeasts.java | 8 ++---
.../scripts/ai/group_template/Monastery.java | 2 +-
.../ai/group_template/PolymorphingAngel.java | 2 +-
.../group_template/PolymorphingOnAttack.java | 2 +-
.../ai/group_template/PrisonGuards.java | 2 +-
.../ai/group_template/SummonMinions.java | 6 ++--
.../data/scripts/ai/individual/Antharas.java | 8 ++---
.../data/scripts/ai/individual/Baium.java | 2 +-
.../data/scripts/ai/individual/Beleth.java | 2 +-
.../game/data/scripts/ai/individual/Core.java | 2 +-
.../ai/individual/DarkWaterDragon.java | 4 +--
.../scripts/ai/individual/DemonPrince.java | 2 +-
.../data/scripts/ai/individual/Epidos.java | 2 +-
.../scripts/ai/individual/GeneralDilios.java | 2 +-
.../scripts/ai/individual/IceFairySirra.java | 2 +-
.../data/scripts/ai/individual/Keltas.java | 2 +-
.../data/scripts/ai/individual/Orfen.java | 3 +-
.../data/scripts/ai/individual/QueenAnt.java | 2 +-
.../scripts/ai/individual/SinWardens.java | 2 +-
.../data/scripts/ai/individual/Valakas.java | 2 +-
.../RainbowSpringsChateau.java | 6 ++--
.../conquerablehalls/flagwar/FlagWar.java | 6 ++--
.../custom/EchoCrystals/EchoCrystals.java | 2 +-
.../KetraOrcSupport/KetraOrcSupport.java | 2 +-
.../scripts/custom/Listeners/Listeners.java | 5 ++--
.../custom/RaidbossInfo/RaidbossInfo.java | 2 +-
.../VarkaSilenosSupport.java | 2 +-
.../admincommandhandlers/AdminEditChar.java | 12 ++++----
.../handlers/bypasshandlers/QuestLink.java | 2 +-
.../handlers/effecthandlers/ConfuseMob.java | 2 +-
.../handlers/effecthandlers/Confusion.java | 2 +-
.../effecthandlers/RandomizeHate.java | 4 +--
.../handlers/effecthandlers/SignetMDam.java | 2 +-
.../handlers/skillhandlers/Resurrect.java | 2 +-
.../handlers/skillhandlers/StealBuffs.java | 2 +-
.../handlers/targethandlers/TargetAlly.java | 2 +-
.../handlers/targethandlers/TargetArea.java | 2 +-
.../targethandlers/TargetAreaCorpseMob.java | 2 +-
.../targethandlers/TargetAreaSummon.java | 2 +-
.../handlers/targethandlers/TargetAura.java | 2 +-
.../targethandlers/TargetAuraCorpseMob.java | 2 +-
.../targethandlers/TargetBehindArea.java | 2 +-
.../targethandlers/TargetBehindAura.java | 2 +-
.../handlers/targethandlers/TargetClan.java | 2 +-
.../targethandlers/TargetClanMember.java | 2 +-
.../targethandlers/TargetCorpseAlly.java | 2 +-
.../targethandlers/TargetCorpseClan.java | 2 +-
.../targethandlers/TargetCorpseMob.java | 2 +-
.../targethandlers/TargetCorpsePlayer.java | 2 +-
.../targethandlers/TargetFrontArea.java | 2 +-
.../targethandlers/TargetFrontAura.java | 2 +-
.../handlers/targethandlers/TargetParty.java | 2 +-
.../targethandlers/TargetPartyClan.java | 2 +-
.../targethandlers/TargetPartyNotMe.java | 2 +-
.../targethandlers/TargetUnlockable.java | 2 +-
.../handlers/telnethandlers/DebugHandler.java | 2 +-
.../AnomicFoundry/AnomicFoundry.java | 2 +-
.../hellbound/BaseTower/BaseTower.java | 2 +-
.../game/data/scripts/hellbound/Engine.java | 2 +-
.../TowerOfInfinitum/TowerOfInfinitum.java | 2 +-
.../hellbound/TowerOfNaia/TowerOfNaia.java | 12 ++++----
.../TullyWorkshop/TullyWorkshop.java | 10 +++----
.../CrystalCaverns/CrystalCaverns.java | 30 +++++++++----------
.../DarkCloudMansion/DarkCloudMansion.java | 4 +--
.../FinalEmperialTomb/FinalEmperialTomb.java | 14 ++++-----
.../Pailaka/PailakaDevilsLegacy.java | 2 +-
.../instances/SeedOfDestruction/Stage1.java | 8 ++---
.../SeedOfInfinity/HallOfSuffering.java | 2 +-
.../mods/eventmodElpies/eventmodElpies.java | 2 +-
.../mods/eventmodRabbits/eventmodRabbits.java | 2 +-
.../mods/eventmodRace/eventmodRace.java | 4 +--
.../Q10276_MutatedKaneusGludio.java | 5 ++--
.../Q10277_MutatedKaneusDion.java | 5 ++--
.../Q10278_MutatedKaneusHeine.java | 5 ++--
.../Q10279_MutatedKaneusOren.java | 5 ++--
.../Q10280_MutatedKaneusSchuttgart.java | 5 ++--
.../Q10281_MutatedKaneusRune.java | 5 ++--
.../Q252_ItSmellsDelicious.java | 5 ++--
.../Q350_EnhanceYourWeapon.java | 6 ++--
.../Q511_AwlUnderFoot/Q511_AwlUnderFoot.java | 2 +-
.../Q691_MatrasSuspiciousRequest.java | 2 +-
.../quests/SagasScripts/SagasSuperClass.java | 6 ++--
.../TerritoryWarSuperClass.java | 6 ++--
.../NewbieTravelToken/NewbieTravelToken.java | 2 +-
.../TeleportToFantasy/TeleportToFantasy.java | 2 +-
.../TeleportToRaceTrack.java | 2 +-
89 files changed, 167 insertions(+), 162 deletions(-)
diff --git a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
index 6d16bcfe80..1c39043b6a 100644
--- a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
@@ -58,10 +58,10 @@ org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
index 43e09c98f0..606a24e101 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
@@ -66,9 +66,9 @@ public class BeastFarm extends L2AttackableAIScript
18873, 18874, 18875, 18876, 18877, 18878, 18879, 18880, 18881, 18882, 18883, 18884, 18885, 18886, 18887, 18888, 18889, 18890, 18891, 18892, 18893, 18894, 18895, 18896, 18897, 18898, 18899, 18900
};
- private static Map<Integer, Integer> _FeedInfo = new FastMap<Integer, Integer>();
- private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new FastMap<Integer, GrowthCapableMob>();
- private static Map<String, SkillHolder[]> _TamedBeastsData = new FastMap<String, SkillHolder[]>();
+ private static Map<Integer, Integer> _FeedInfo = new FastMap<>();
+ private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new FastMap<>();
+ private static Map<String, SkillHolder[]> _TamedBeastsData = new FastMap<>();
// all mobs that grow by eating
private static class GrowthCapableMob
@@ -76,7 +76,7 @@ public class BeastFarm extends L2AttackableAIScript
private final int _chance;
private final int _growthLevel;
private final int _tameNpcId;
- private final Map<Integer, Integer> _skillSuccessNpcIdList = new FastMap<Integer, Integer>();
+ private final Map<Integer, Integer> _skillSuccessNpcIdList = new FastMap<>();
public GrowthCapableMob(int chance, int growthLevel, int tameNpcId)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
index 9d0951d29b..76aecfc86f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/EnergySeeds.java
@@ -52,7 +52,7 @@ public class EnergySeeds extends L2AttackableAIScript
private static final int RATE = 1;
private static final int RESPAWN = 480000;
private static final int RANDOM_RESPAWN_OFFSET = 180000;
- private static Map<Integer, ESSpawn> _spawns = new FastMap<Integer, ESSpawn>();
+ private static Map<Integer, ESSpawn> _spawns = new FastMap<>();
protected static Map<L2Npc, Integer> _spawnedNpcs = new FastMap<L2Npc, Integer>().shared();
private static final int TEMPORARY_TELEPORTER = 32602;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
index f80347abc5..f77bd4c844 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
@@ -56,7 +56,7 @@ public class FeedableBeasts extends L2AttackableAIScript
16015,16016,16017,16018
};
- private static final Map<Integer,Integer> MAD_COW_POLYMORPH = new FastMap<Integer,Integer>();
+ private static final Map<Integer,Integer> MAD_COW_POLYMORPH = new FastMap<>();
static
{
@@ -103,8 +103,8 @@ public class FeedableBeasts extends L2AttackableAIScript
"Yam, yam, yam, yam, yam!"
};
- private static Map<Integer,Integer> _FeedInfo = new FastMap<Integer,Integer>();
- private static Map<Integer,GrowthCapableMob> _GrowthCapableMobs = new FastMap<Integer,GrowthCapableMob>();
+ private static Map<Integer,Integer> _FeedInfo = new FastMap<>();
+ private static Map<Integer,GrowthCapableMob> _GrowthCapableMobs = new FastMap<>();
// all mobs that grow by eating
private static class GrowthCapableMob
@@ -112,7 +112,7 @@ public class FeedableBeasts extends L2AttackableAIScript
private final int _growthLevel;
private final int _chance;
- private final Map<Integer, int[][]> _spiceToMob = new FastMap<Integer,int[][]>();
+ private final Map<Integer, int[][]> _spiceToMob = new FastMap<>();
public GrowthCapableMob(int growthLevel, int chance)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java
index 8672b57392..f31aa0347a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Monastery.java
@@ -131,7 +131,7 @@ public class Monastery extends L2AttackableAIScript
{
if (Util.contains(mobs1, npc.getNpcId()))
{
- FastList<L2Playable> result = new FastList<L2Playable>();
+ FastList<L2Playable> result = new FastList<>();
Collection<L2Object> objs = npc.getKnownList().getKnownObjects().values();
for (L2Object obj : objs)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
index 13ae2dbd97..1ba7cd078e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
public class PolymorphingAngel extends L2AttackableAIScript
{
- private static final Map<Integer, Integer> ANGELSPAWNS = new FastMap<Integer, Integer>();
+ private static final Map<Integer, Integer> ANGELSPAWNS = new FastMap<>();
static
{
ANGELSPAWNS.put(20830, 20859);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
index b9d9bff854..b7677114b4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
*/
public class PolymorphingOnAttack extends L2AttackableAIScript
{
- private static final TIntObjectHashMap<Integer[]> MOBSPAWNS = new TIntObjectHashMap<Integer[]>();
+ private static final TIntObjectHashMap<Integer[]> MOBSPAWNS = new TIntObjectHashMap<>();
static
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java
index 637bd7cc51..27fd98478d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends L2AttackableAIScript
private boolean _firstAttacked = false;
- private final Map<L2Npc, Integer> _guards = new FastMap<L2Npc, Integer>();
+ private final Map<L2Npc, Integer> _guards = new FastMap<>();
public PrisonGuards(int questId, String name, String descr)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java
index a926a5d5e0..b0320790dc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java
@@ -35,7 +35,7 @@ public class SummonMinions extends L2AttackableAIScript
private static int HasSpawned;
private static TIntHashSet myTrackingSet = new TIntHashSet(); // Used to track instances of npcs
private final FastMap<Integer, FastList<L2PcInstance>> _attackersList = new FastMap<Integer, FastList<L2PcInstance>>().shared();
- private static final TIntObjectHashMap<int[]> MINIONS = new TIntObjectHashMap<int[]>();
+ private static final TIntObjectHashMap<int[]> MINIONS = new TIntObjectHashMap<>();
static
{
@@ -204,7 +204,7 @@ public class SummonMinions extends L2AttackableAIScript
{
if (_attackersList.get(npcObjId) == null)
{
- FastList<L2PcInstance> player = new FastList<L2PcInstance>();
+ FastList<L2PcInstance> player = new FastList<>();
player.add(member);
_attackersList.put(npcObjId, player);
}
@@ -218,7 +218,7 @@ public class SummonMinions extends L2AttackableAIScript
{
if (_attackersList.get(npcObjId) == null)
{
- FastList<L2PcInstance> player = new FastList<L2PcInstance>();
+ FastList<L2PcInstance> player = new FastList<>();
player.add(attacker);
_attackersList.put(npcObjId, player);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
index 92e181fcee..d50fe7237e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
@@ -85,14 +85,14 @@ public class Antharas extends L2AttackableAIScript
}
};
- protected List<L2Spawn> _teleportCubeSpawn = new FastList<L2Spawn>();
- protected List<L2Npc> _teleportCube = new FastList<L2Npc>();
+ protected List<L2Spawn> _teleportCubeSpawn = new FastList<>();
+ protected List<L2Npc> _teleportCube = new FastList<>();
// Spawn data of monsters.
- protected TIntObjectHashMap<L2Spawn> _monsterSpawn = new TIntObjectHashMap<L2Spawn>();
+ protected TIntObjectHashMap<L2Spawn> _monsterSpawn = new TIntObjectHashMap<>();
// Instance of monsters.
- protected List<L2Npc> _monsters = new FastList<L2Npc>();
+ protected List<L2Npc> _monsters = new FastList<>();
protected L2GrandBossInstance _antharas = null;
// monstersId
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
index ff959d7256..7ee4397614 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
@@ -86,7 +86,7 @@ public class Baium extends L2AttackableAIScript
};
private long _LastAttackVsBaiumTime = 0;
- protected final List<L2Npc> _Minions = new ArrayList<L2Npc>(5);
+ protected final List<L2Npc> _Minions = new ArrayList<>(5);
private L2BossZone _Zone;
public Baium(int questId, String name, String descr)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
index d2008b3449..9b9077c7b6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
@@ -69,7 +69,7 @@ public class Beleth extends L2AttackableAIScript
private static int allowObjectId = 0;
private static int killed = 0;
protected static ScheduledFuture<?> spawnTimer = null;
- protected static ArrayList<L2Npc> minions = new ArrayList<L2Npc>();
+ protected static ArrayList<L2Npc> minions = new ArrayList<>();
private static L2Skill Bleed = SkillTable.getInstance().getInfo(5495, 1);
private static L2Skill Fireball = SkillTable.getInstance().getInfo(5496, 1);
private static L2Skill HornOfRising = SkillTable.getInstance().getInfo(5497, 1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java
index ca36519686..45f019031a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java
@@ -51,7 +51,7 @@ public class Core extends L2AttackableAIScript
private static boolean _FirstAttacked;
- List<L2Attackable> Minions = new FastList<L2Attackable>();
+ private List<L2Attackable> Minions = new FastList<>();
public Core(int id, String name, String descr)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
index 1993c3ed75..6fc653b2ac 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
@@ -33,8 +33,8 @@ public class DarkWaterDragon extends L2AttackableAIScript
private static final int FAFURION = 18482;
private static final int DETRACTOR1 = 22270;
private static final int DETRACTOR2 = 22271;
- private static FastSet<Integer> secondSpawn = new FastSet<Integer>(); // Used to track if second Shades were already spawned
- private static FastSet<Integer> myTrackingSet = new FastSet<Integer>(); // Used to track instances of npcs
+ private static FastSet<Integer> secondSpawn = new FastSet<>(); // Used to track if second Shades were already spawned
+ private static FastSet<Integer> myTrackingSet = new FastSet<>(); // Used to track instances of npcs
private static FastMap<Integer, L2PcInstance> _idmap = new FastMap<Integer, L2PcInstance>().shared(); // Used to track instances of npcs
public DarkWaterDragon(int id, String name, String descr)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java
index 5a5a070ac0..072e187385 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DemonPrince.java
@@ -38,7 +38,7 @@ public class DemonPrince extends L2AttackableAIScript
new SkillHolder(5376, 4), new SkillHolder(5376, 5), new SkillHolder(5376, 6)
};
- private static final Map<Integer, Boolean> _attackState = new FastMap<Integer, Boolean>();
+ private static final Map<Integer, Boolean> _attackState = new FastMap<>();
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java
index 43dfc915ee..cd6809b686 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java
@@ -45,7 +45,7 @@ public class Epidos extends L2AttackableAIScript
3, 6, 11
};
- private final Map<Integer, Double> _lastHp = new FastMap<Integer, Double>();
+ private final Map<Integer, Double> _lastHp = new FastMap<>();
@Override
public final String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/GeneralDilios.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/GeneralDilios.java
index 870d6a66b5..cc711a759c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/GeneralDilios.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/GeneralDilios.java
@@ -36,7 +36,7 @@ public class GeneralDilios extends L2AttackableAIScript
private static final int guardId = 32619;
private L2Npc _general;
- private final List<L2Npc> _guards = new ArrayList<L2Npc>();
+ private final List<L2Npc> _guards = new ArrayList<>();
private static final NpcStringId[] diliosText =
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
index 5fb82762d5..e444dfb54a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
@@ -48,7 +48,7 @@ public class IceFairySirra extends L2AttackableAIScript
private static final int SILVER_HEMOCYTE = 8057;
private static L2BossZone _sirrasZone;
private static L2PcInstance _player = null;
- protected FastList<L2Npc> _allMobs = new FastList<L2Npc>();
+ protected FastList<L2Npc> _allMobs = new FastList<>();
protected Future<?> _onDeadEventTask = null;
public IceFairySirra(int id, String name, String descr)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Keltas.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Keltas.java
index 32169801b7..a7f5f68a05 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Keltas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Keltas.java
@@ -186,7 +186,7 @@ public class Keltas extends Quest
addKillId(KELTAS);
addSpawnId(KELTAS);
- spawnedMonsters = new FastList<L2Spawn>();
+ spawnedMonsters = new FastList<>();
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
index 5b042ea3af..2b75e30d3a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
@@ -44,7 +44,6 @@ import com.l2jserver.gameserver.network.serverpackets.PlaySound;
*/
public class Orfen extends L2AttackableAIScript
{
-
//@formatter:off
private static final Location[] Pos =
{
@@ -70,7 +69,7 @@ public class Orfen extends L2AttackableAIScript
private static final int RIBA_IREN = 29018;
private static boolean _IsTeleported;
- private static List<L2Attackable> _Minions = new FastList<L2Attackable>();
+ private static List<L2Attackable> _Minions = new FastList<>();
private static L2BossZone _Zone;
private static final byte ALIVE = 0;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
index 3707629d44..b39df71f35 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
@@ -74,7 +74,7 @@ public class QueenAnt extends L2AttackableAIScript
private L2MonsterInstance _queen = null;
private L2MonsterInstance _larva = null;
- private final List<L2MonsterInstance> _nurses = new FastList<L2MonsterInstance>(5);
+ private final List<L2MonsterInstance> _nurses = new FastList<>(5);
public QueenAnt(int questId, String name, String descr)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/SinWardens.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/SinWardens.java
index df70789122..25c8e8ad26 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/SinWardens.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/SinWardens.java
@@ -37,7 +37,7 @@ public class SinWardens extends L2AttackableAIScript
22424, 22425, 22426, 22427, 22428, 22429, 22430, 22432, 22433, 22434, 22435, 22436, 22437, 22438
};
- private final Map<Integer, Integer> killedMinionsCount = new FastMap<Integer, Integer>();
+ private final Map<Integer, Integer> killedMinionsCount = new FastMap<>();
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
index 7ecad7d8f4..10617fd60d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
@@ -1369,7 +1369,7 @@ public class Valakas extends L2AttackableAIScript
public L2Character getRandomTarget(L2Npc npc)
{
- FastList<L2Character> result = new FastList<L2Character>();
+ FastList<L2Character> result = new FastList<>();
Collection<L2Character> objs = npc.getKnownList().getKnownCharacters();
{
for (L2Character cha : objs)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 30d2bc261c..723770793e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -283,9 +283,9 @@ public class RainbowSpringsChateau extends Quest
};
protected static TIntLongHashMap _warDecreesCount = new TIntLongHashMap();
- protected static List<L2Clan> _acceptedClans = new ArrayList<L2Clan>(4);
- private static Map<String, ArrayList<L2Clan>> _usedTextPassages = new HashMap<String, ArrayList<L2Clan>>();
- private static Map<L2Clan, Integer> _pendingItemToGet = new HashMap<L2Clan, Integer>();
+ protected static List<L2Clan> _acceptedClans = new ArrayList<>(4);
+ private static Map<String, ArrayList<L2Clan>> _usedTextPassages = new HashMap<>();
+ private static Map<L2Clan, Integer> _pendingItemToGet = new HashMap<>();
protected static SiegableHall _rainbow;
protected static ScheduledFuture<?> _nextSiege, _siegeEnd;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 9921bc11a7..850c9a3820 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -90,7 +90,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
protected static L2CharPosition CENTER;
- protected TIntObjectHashMap<ClanData> _data = new TIntObjectHashMap<ClanData>(6);
+ protected TIntObjectHashMap<ClanData> _data = new TIntObjectHashMap<>(6);
protected L2Clan _winner;
private boolean _firstPhase;
@@ -852,8 +852,8 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
int flag = 0;
int npc = 0;
- ArrayList<Integer> players = new ArrayList<Integer>(18);
- ArrayList<L2PcInstance> playersInstance = new ArrayList<L2PcInstance>(18);
+ ArrayList<Integer> players = new ArrayList<>(18);
+ ArrayList<L2PcInstance> playersInstance = new ArrayList<>(18);
L2Spawn warrior = null;
L2Spawn flagInstance = null;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
index 550b6170bd..f35c27c893 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
@@ -40,7 +40,7 @@ public class EchoCrystals extends Quest
private static final int ADENA = 57;
private static final int COST = 200;
- private static final Map<Integer, ScoreData> SCORES = new FastMap<Integer, ScoreData>();
+ private static final Map<Integer, ScoreData> SCORES = new FastMap<>();
private class ScoreData
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java
index ebd2f8f3d4..d3b68d8c05 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java
@@ -49,7 +49,7 @@ public class KetraOrcSupport extends Quest
private static final int HORN = 7186;
- private static final TIntObjectHashMap<BuffsData> BUFF = new TIntObjectHashMap<BuffsData>();
+ private static final TIntObjectHashMap<BuffsData> BUFF = new TIntObjectHashMap<>();
private class BuffsData
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Listeners/Listeners.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Listeners/Listeners.java
index 8ad27ccfd0..a46d5d31c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Listeners/Listeners.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Listeners/Listeners.java
@@ -14,12 +14,11 @@
*/
package custom.Listeners;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
@@ -75,7 +74,7 @@ public class Listeners extends L2Script
public void onPlayerLogin(L2PcInstance player)
{
_log.log(Level.INFO, "Player " + player.getName() + " just logged in!");
- List<Integer> items = new FastList<Integer>();
+ List<Integer> items = new ArrayList<>();
for (L2ItemInstance item : player.getInventory().getItems())
{
items.add(item.getItemId());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
index 0df8f71824..6df257082c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
@@ -49,7 +49,7 @@ public class RaidbossInfo extends Quest
31833, 31834, 31835, 31836, 31837, 31838, 31839, 31840, 31841, 32337, 32338, 32339, 32340
};
- private static final Map<Integer, Location> RADAR = new FastMap<Integer, Location>();
+ private static final Map<Integer, Location> RADAR = new FastMap<>();
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java
index edb1adee20..08fc1d209b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -49,7 +49,7 @@ public class VarkaSilenosSupport extends Quest
private static final int SEED = 7187;
- private static final TIntObjectHashMap<BuffsData> BUFF = new TIntObjectHashMap<BuffsData>();
+ private static final TIntObjectHashMap<BuffsData> BUFF = new TIntObjectHashMap<>();
private class BuffsData
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 1032764220..c4dfdc7d3b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1255,12 +1255,12 @@ public class AdminEditChar implements IAdminCommandHandler
{
L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
- Map<String, List<L2PcInstance>> ipMap = new HashMap<String, List<L2PcInstance>>();
+ Map<String, List<L2PcInstance>> ipMap = new HashMap<>();
String ip = "0.0.0.0";
L2GameClient client;
- final Map<String, Integer> dualboxIPs = new HashMap<String, Integer>();
+ final Map<String, Integer> dualboxIPs = new HashMap<>();
for (L2PcInstance player : players)
{
@@ -1285,7 +1285,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
}
- List<String> keys = new ArrayList<String>(dualboxIPs.keySet());
+ List<String> keys = new ArrayList<>(dualboxIPs.keySet());
Collections.sort(keys, new Comparator<String>() {
@Override
public int compare(String left, String right)
@@ -1313,11 +1313,11 @@ public class AdminEditChar implements IAdminCommandHandler
{
L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
- Map<IpPack, List<L2PcInstance>> ipMap = new HashMap<IpPack, List<L2PcInstance>>();
+ Map<IpPack, List<L2PcInstance>> ipMap = new HashMap<>();
L2GameClient client;
- final Map<IpPack, Integer> dualboxIPs = new HashMap<IpPack, Integer>();
+ final Map<IpPack, Integer> dualboxIPs = new HashMap<>();
for (L2PcInstance player : players)
{
@@ -1342,7 +1342,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
}
- List<IpPack> keys = new ArrayList<IpPack>(dualboxIPs.keySet());
+ List<IpPack> keys = new ArrayList<>(dualboxIPs.keySet());
Collections.sort(keys, new Comparator<IpPack>() {
@Override
public int compare(IpPack left, IpPack right)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9c0dd5a3d9..2587ebc617 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -235,7 +235,7 @@ public class QuestLink implements IBypassHandler
public static void showQuestWindow(L2PcInstance player, L2Npc npc)
{
// collect awaiting quests and start points
- List<Quest> options = new FastList<Quest>();
+ List<Quest> options = new FastList<>();
QuestState[] awaits = player.getQuestsForTalk(npc.getTemplate().getNpcId());
List<Quest> starts = npc.getTemplate().getEventQuests(QuestEventType.QUEST_START);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConfuseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConfuseMob.java
index cc8965e554..8e28144100 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConfuseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConfuseMob.java
@@ -64,7 +64,7 @@ public class ConfuseMob extends L2Effect
@Override
public boolean onActionTime()
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
// Getting the possible targets
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confusion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confusion.java
index da621fe194..996b08a05a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confusion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confusion.java
@@ -64,7 +64,7 @@ public class Confusion extends L2Effect
@Override
public boolean onActionTime()
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
// Getting the possible targets
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
index 5385a80517..8e3140a4b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
@@ -52,7 +52,7 @@ public class RandomizeHate extends L2Effect
L2Attackable effectedMob = (L2Attackable) getEffected();
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
// Getting the possible targets
@@ -61,7 +61,7 @@ public class RandomizeHate extends L2Effect
{
if (cha != null && (cha != effectedMob) && (cha != getEffector()))
{
- // Aggro cannot be transfared to a mob of the same faction.
+ // Aggro cannot be transfered to a mob of the same faction.
if (cha instanceof L2Attackable && ((L2Attackable) cha).getFactionId() != null && ((L2Attackable) cha).getFactionId().equals(effectedMob.getFactionId()))
continue;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
index c842fd5de4..be80595c52 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
@@ -123,7 +123,7 @@ public class SignetMDam extends L2Effect
}
}
- FastList<L2Character> targets = new FastList<L2Character>();
+ FastList<L2Character> targets = new FastList<>();
for (L2Character cha : _actor.getKnownList().getKnownCharactersInRadius(getSkill().getSkillRadius()))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
index 0b87ecbc53..1a250a2503 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
@@ -44,7 +44,7 @@ public class Resurrect implements ISkillHandler
player = (L2PcInstance) activeChar;
L2PcInstance targetPlayer;
- List<L2Character> targetToRes = new FastList<L2Character>();
+ List<L2Character> targetToRes = new FastList<>();
for (L2Character target: (L2Character[]) targets)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
index ea57a3a25c..387cd400ed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
@@ -104,7 +104,7 @@ public class StealBuffs implements ISkillHandler
Env env;
int lastSkillId = 0;
final L2Effect[] effects = target.getAllEffects();
- final ArrayList<L2Effect> toSteal = new ArrayList<L2Effect>(count);
+ final ArrayList<L2Effect> toSteal = new ArrayList<>(count);
for (int i = effects.length; --i >= 0;) // reverse order
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
index 54266254e1..640b03fea8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
@@ -36,7 +36,7 @@ public class TargetAlly implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (activeChar instanceof L2Playable)
{
final L2PcInstance player = activeChar.getActingPlayer();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
index edcc32de0c..12a52e0d9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
@@ -37,7 +37,7 @@ public class TargetArea implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
index 7d559e21db..c1cc0d8b90 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
@@ -37,7 +37,7 @@ public class TargetAreaCorpseMob implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if ((!(target instanceof L2Attackable)) || !target.isDead())
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
index 7f0918f00e..37e8a58f4d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
@@ -37,7 +37,7 @@ public class TargetAreaSummon implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
target = activeChar.getPet();
if (target == null || !(target instanceof L2ServitorInstance) || target.isDead())
return _emptyTargetList;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
index 22e4b6dba7..20ac93534c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
@@ -38,7 +38,7 @@ public class TargetAura implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
final boolean srcInArena = (activeChar.isInsideZone(L2Character.ZONE_PVP) && !activeChar.isInsideZone(L2Character.ZONE_SIEGE));
final L2PcInstance sourcePlayer = activeChar.getActingPlayer();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
index 198e5a1932..6b47c43518 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
@@ -34,7 +34,7 @@ public class TargetAuraCorpseMob implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
// Go through the L2Character _knownList
final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getSkillRadius());
for (L2Character obj : objs)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
index 686c62d1a0..57f95fe0aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
@@ -37,7 +37,7 @@ public class TargetBehindArea implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
index 15dc6cfeba..dd1fc30247 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
@@ -38,7 +38,7 @@ public class TargetBehindAura implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
final boolean srcInArena = (activeChar.isInsideZone(L2Character.ZONE_PVP) && !activeChar.isInsideZone(L2Character.ZONE_SIEGE));
final L2PcInstance sourcePlayer = activeChar.getActingPlayer();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
index 04b6b9219b..6cb1928b7d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
@@ -40,7 +40,7 @@ public class TargetClan implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (activeChar instanceof L2Playable)
{
final L2PcInstance player = activeChar.getActingPlayer();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
index f7672bb605..8a16b0b4e5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
@@ -35,7 +35,7 @@ public class TargetClanMember implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (activeChar instanceof L2Npc)
{
// for buff purposes, returns friendly mobs nearby and mob itself
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
index c87d8a33db..3baa9c2d76 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
@@ -37,7 +37,7 @@ public class TargetCorpseAlly implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (activeChar instanceof L2Playable)
{
final L2PcInstance player = activeChar.getActingPlayer();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
index ae6d3fc5d5..4fd3649661 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
@@ -41,7 +41,7 @@ public class TargetCorpseClan implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (activeChar instanceof L2Playable)
{
final L2PcInstance player = activeChar.getActingPlayer();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
index 2ba6cebc6a..58fe3da657 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
@@ -36,7 +36,7 @@ public class TargetCorpseMob implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
final boolean isSummon = target instanceof L2ServitorInstance;
if (!(isSummon || target instanceof L2Attackable) || !target.isDead())
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
index a0f7f0c43f..0c5e333b8c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
@@ -36,7 +36,7 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (target != null && target.isDead())
{
final L2PcInstance player;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
index e10bc0f5e4..c149a116bf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
@@ -37,7 +37,7 @@ public class TargetFrontArea implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
index 987d9dc6d7..d484f0d1e2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
@@ -38,7 +38,7 @@ public class TargetFrontAura implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
final boolean srcInArena = (activeChar.isInsideZone(L2Character.ZONE_PVP) && !activeChar.isInsideZone(L2Character.ZONE_SIEGE));
final L2PcInstance sourcePlayer = activeChar.getActingPlayer();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
index c38210f411..b5d94a9a4d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
@@ -34,7 +34,7 @@ public class TargetParty implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (onlyFirst)
return new L2Character[] { activeChar };
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
index ed042addad..df0a20bbf9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
@@ -35,7 +35,7 @@ public class TargetPartyClan implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (onlyFirst)
return new L2Character[] { activeChar };
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
index 92d97e9f9b..2fe13c0170 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
@@ -35,7 +35,7 @@ public class TargetPartyNotMe implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (onlyFirst)
return new L2Character[] { activeChar };
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
index 241ce6719c..a305399987 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
@@ -34,7 +34,7 @@ public class TargetUnlockable implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (!(target instanceof L2DoorInstance) && !(target instanceof L2ChestInstance))
{
return _emptyTargetList;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
index a10f12f038..ead47b906c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
@@ -202,7 +202,7 @@ public class DebugHandler implements ITelnetHandler
sb.append("## Threads Information ##\n");
Map<Thread, StackTraceElement[]> allThread = Thread.getAllStackTraces();
- FastTable<Entry<Thread, StackTraceElement[]>> entries = new FastTable<Entry<Thread, StackTraceElement[]>>();
+ FastTable<Entry<Thread, StackTraceElement[]>> entries = new FastTable<>();
entries.setValueComparator(new FastComparator<Entry<Thread, StackTraceElement[]>>()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java
index bf5cb0cfad..3043470922 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java
@@ -72,7 +72,7 @@ public class AnomicFoundry extends Quest
{
0, 0, 0, 0, 0
};
- private final Map<Integer, Integer> _atkIndex = new FastMap<Integer, Integer>();
+ private final Map<Integer, Integer> _atkIndex = new FastMap<>();
public AnomicFoundry(int questId, String name, String descr)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
index ae5eee9f22..d632c58f06 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
@@ -35,7 +35,7 @@ public class BaseTower extends Quest
private static final int KENDAL = 32301;
private static final int BODY_DESTROYER = 22363;
- private static final Map<Integer, L2PcInstance> BODY_DESTROYER_TARGET_LIST = new FastMap<Integer, L2PcInstance>();
+ private static final Map<Integer, L2PcInstance> BODY_DESTROYER_TARGET_LIST = new FastMap<>();
private static final SkillHolder DEATH_WORD = new SkillHolder(5256, 1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
index 198df171ed..382042c466 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
@@ -66,7 +66,7 @@ public class Engine extends Quest implements Runnable
private int _cachedLevel = -1;
- private static Map<Integer, PointsInfoHolder> pointsInfo = new FastMap<Integer, PointsInfoHolder>();
+ private static Map<Integer, PointsInfoHolder> pointsInfo = new FastMap<>();
// Holds info about points for mob killing
private class PointsInfoHolder
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfInfinitum/TowerOfInfinitum.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfInfinitum/TowerOfInfinitum.java
index fea5b96121..3fc7ba0761 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfInfinitum/TowerOfInfinitum.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfInfinitum/TowerOfInfinitum.java
@@ -36,7 +36,7 @@ public class TowerOfInfinitum extends Quest
private static final int PASS_SKILL = 2357;
- private static final Map<Integer, Location[]> TELE_COORDS = new HashMap<Integer, Location[]>();
+ private static final Map<Integer, Location[]> TELE_COORDS = new HashMap<>();
public TowerOfInfinitum(int questId, String name, String descr)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
index db52a4e83e..6134ea115e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
@@ -131,9 +131,9 @@ public class TowerOfNaia extends Quest
NpcStringId.ITS_S1, NpcStringId.S1_IS_STRONG, NpcStringId.ITS_ALWAYS_S1, NpcStringId.S1_WONT_DO
};
- private static Map<Integer, int[]> DOORS = new HashMap<Integer, int[]>();
- private static Map<Integer, Integer> ZONES = new HashMap<Integer, Integer>();
- private static Map<Integer, int[][]> SPAWNS = new HashMap<Integer, int[][]>();
+ private static Map<Integer, int[]> DOORS = new HashMap<>();
+ private static Map<Integer, Integer> ZONES = new HashMap<>();
+ private static Map<Integer, int[][]> SPAWNS = new HashMap<>();
private L2MonsterInstance _lock;
private final L2Npc _controller;
@@ -146,8 +146,8 @@ public class TowerOfNaia extends Quest
private int _challengeState;
private int _winIndex;
- private final Map<Integer, Boolean> _activeRooms = new FastMap<Integer, Boolean>();
- private final Map<Integer, List<L2Npc>> _spawns = new FastMap<Integer, List<L2Npc>>();
+ private final Map<Integer, Boolean> _activeRooms = new FastMap<>();
+ private final Map<Integer, List<L2Npc>> _spawns = new FastMap<>();
private final FastList<L2Npc> _sporeSpawn = new FastList<L2Npc>().shared();
static
@@ -1032,7 +1032,7 @@ public class TowerOfNaia extends Quest
if (SPAWNS.containsKey(managerId))
{
int[][] spawnList = SPAWNS.get(managerId);
- List<L2Npc> spawned = new FastList<L2Npc>();
+ List<L2Npc> spawned = new FastList<>();
for (int[] spawn : spawnList)
{
L2Npc spawnedNpc = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
index db3b816937..9f35fc332e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
@@ -98,8 +98,8 @@ public class TullyWorkshop extends Quest
22377, 22378, 22379, 22383
};
- private static final Map<Integer, int[]> TULLY_DOORLIST = new FastMap<Integer, int[]>();
- private static final Map<Integer, int[][]> TELE_COORDS = new FastMap<Integer, int[][]>();
+ private static final Map<Integer, int[]> TULLY_DOORLIST = new FastMap<>();
+ private static final Map<Integer, int[][]> TELE_COORDS = new FastMap<>();
protected int countdownTime;
private int nextServantIdx = 0;
@@ -112,13 +112,13 @@ public class TullyWorkshop extends Quest
protected ScheduledFuture<?> _countdown = null;
// NPC's, spawned after Tully's death are stored here
- protected static List<L2Npc> postMortemSpawn = new FastList<L2Npc>();
+ protected static List<L2Npc> postMortemSpawn = new FastList<>();
protected static TIntHashSet brokenContraptions = new TIntHashSet();
protected static TIntHashSet rewardedContraptions = new TIntHashSet();
protected static TIntHashSet talkedContraptions = new TIntHashSet();
- private final List<L2MonsterInstance> spawnedFollowers = new FastList<L2MonsterInstance>();
- private final List<L2MonsterInstance> spawnedFollowerMinions = new FastList<L2MonsterInstance>();
+ private final List<L2MonsterInstance> spawnedFollowers = new FastList<>();
+ private final List<L2MonsterInstance> spawnedFollowerMinions = new FastList<>();
private L2Npc spawnedAgent = null;
private L2Spawn pillarSpawn = null;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 3cbb2b7765..ee42ff1cb5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -82,31 +82,31 @@ public class CrystalCaverns extends Quest
private class CCWorld extends InstanceWorld
{
- public Map<L2Npc,Boolean> npcList1 = new FastMap<L2Npc,Boolean>();
+ public Map<L2Npc,Boolean> npcList1 = new FastMap<>();
public L2Npc tears;
public boolean isUsedInvulSkill = false;
public long dragonScaleStart = 0;
public int dragonScaleNeed = 0;
public int cleanedRooms = 0;
public long endTime = 0;
- public List<L2Npc> copys = new FastList<L2Npc>();
- public Map<L2Npc,CrystalGolem> crystalGolems = new FastMap<L2Npc,CrystalGolem>();
+ public List<L2Npc> copys = new FastList<>();
+ public Map<L2Npc,CrystalGolem> crystalGolems = new FastMap<>();
public int correctGolems = 0;
public boolean[] OracleTriggered = {false,false,false};
public int kechisHenchmanSpawn = 0;
public int[] roomsStatus = {0,0,0,0}; // 0: not spawned, 1: spawned, 2: cleared
- public Map<L2DoorInstance, L2PcInstance> openedDoors = new FastMap<L2DoorInstance, L2PcInstance>();
- public Map<Integer, Map<L2Npc,Boolean>> npcList2 = new FastMap<Integer, Map<L2Npc,Boolean>>();
- public Map<L2Npc,L2Npc> oracles = new FastMap<L2Npc,L2Npc>();
- public List<L2Npc> keyKeepers = new FastList<L2Npc>();
- public List<L2Npc> guards = new FastList<L2Npc>();
- public List<L2Npc> oracle = new FastList<L2Npc>();
+ public Map<L2DoorInstance, L2PcInstance> openedDoors = new FastMap<>();
+ public Map<Integer, Map<L2Npc,Boolean>> npcList2 = new FastMap<>();
+ public Map<L2Npc,L2Npc> oracles = new FastMap<>();
+ public List<L2Npc> keyKeepers = new FastList<>();
+ public List<L2Npc> guards = new FastList<>();
+ public List<L2Npc> oracle = new FastList<>();
// baylor variables
- protected final List<L2PcInstance> _raiders = new FastList<L2PcInstance>();
+ protected final List<L2PcInstance> _raiders = new FastList<>();
protected int _raidStatus = 0;
protected long _dragonClawStart = 0;
protected int _dragonClawNeed = 0;
- protected final List<L2Npc> _animationMobs = new FastList<L2Npc>();
+ protected final List<L2Npc> _animationMobs = new FastList<>();
protected L2Npc _camera = null;
protected L2Npc _baylor = null;
protected L2Npc _alarm = null;
@@ -654,7 +654,7 @@ public class CrystalCaverns extends Quest
{
world.status = 3;
- Map<L2Npc, Boolean> spawnList = new FastMap<L2Npc, Boolean>();
+ Map<L2Npc, Boolean> spawnList = new FastMap<>();
for (int[] spawn : EMERALD_SPAWNS)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.instanceId);
@@ -665,7 +665,7 @@ public class CrystalCaverns extends Quest
protected void runEmeraldRooms(CCWorld world, int[][] spawnList, int room)
{
- Map<L2Npc, Boolean> spawned = new FastMap<L2Npc, Boolean>();
+ Map<L2Npc, Boolean> spawned = new FastMap<>();
for (int[] spawn : spawnList)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.instanceId);
@@ -691,7 +691,7 @@ public class CrystalCaverns extends Quest
{
world.status = status;
- Map<L2Npc, Boolean> spawned = new FastMap<L2Npc, Boolean>();
+ Map<L2Npc, Boolean> spawned = new FastMap<>();
for (int[] spawn : spawnList)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.instanceId);
@@ -1195,7 +1195,7 @@ public class CrystalCaverns extends Quest
if (world.status != 3 || !world.crystalGolems.containsKey(npc) || world.crystalGolems.get(npc).foodItem != null || world.crystalGolems.get(npc).isAtDestination)
return "";
CrystalGolem cryGolem = world.crystalGolems.get(npc);
- List<L2Object> crystals = new FastList<L2Object>();
+ List<L2Object> crystals = new FastList<>();
for (L2Object object : L2World.getInstance().getVisibleObjects(npc, 300))
{
if (object instanceof L2ItemInstance && ((L2ItemInstance) object).getItemId() == CRYSTALFOOD)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 94ba650421..440f45b072 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -68,7 +68,7 @@ public class DarkCloudMansion extends Quest
protected static class DMCRoom
{
- public FastList<DMCNpc> npcList = new FastList<DMCNpc>();
+ public FastList<DMCNpc> npcList = new FastList<>();
public int counter = 0;
public int reset = 0;
public int founded = 0;
@@ -77,7 +77,7 @@ public class DarkCloudMansion extends Quest
private class DMCWorld extends InstanceWorld
{
- public FastMap<String,DMCRoom> rooms = new FastMap<String,DMCRoom>();
+ public FastMap<String,DMCRoom> rooms = new FastMap<>();
public DMCWorld()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index 8393ae77f6..2f19909e48 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -84,7 +84,7 @@ public class FinalEmperialTomb extends Quest
private class FETWorld extends InstanceWorld
{
public Lock lock = new ReentrantLock();
- public List<L2Npc> npcList = new FastList<L2Npc>();
+ public List<L2Npc> npcList = new FastList<>();
public int darkChoirPlayerCount = 0;
public FrintezzaSong OnSong = null;
public ScheduledFuture<?> songTask = null;
@@ -97,8 +97,8 @@ public class FinalEmperialTomb extends Quest
public L2Npc scarletDummy = null;
public L2GrandBossInstance frintezza = null;
public L2GrandBossInstance activeScarlet = null;
- public List<L2MonsterInstance> demons = new FastList<L2MonsterInstance>();
- public Map<L2MonsterInstance, Integer> portraits = new FastMap<L2MonsterInstance, Integer>();
+ public List<L2MonsterInstance> demons = new FastList<>();
+ public Map<L2MonsterInstance, Integer> portraits = new FastMap<>();
public int scarlet_x = 0;
public int scarlet_y = 0;
public int scarlet_z = 0;
@@ -145,9 +145,9 @@ public class FinalEmperialTomb extends Quest
private static final int MAX_PLAYERS = 45;
private static final boolean debug = false;
- private final TIntObjectHashMap<L2Territory> _spawnZoneList = new TIntObjectHashMap<L2Territory>();
- private final TIntObjectHashMap<List<FETSpawn>> _spawnList = new TIntObjectHashMap<List<FETSpawn>>();
- private final List<Integer> _mustKillMobsId = new FastList<Integer>();
+ private final TIntObjectHashMap<L2Territory> _spawnZoneList = new TIntObjectHashMap<>();
+ private final TIntObjectHashMap<List<FETSpawn>> _spawnList = new TIntObjectHashMap<>();
+ private final List<Integer> _mustKillMobsId = new FastList<>();
// Teleports
private static final int[] ENTER_TELEPORT = {-88015,-141153,-9168};
@@ -733,7 +733,7 @@ public class FinalEmperialTomb extends Quest
if (_world.frintezza != null && !_world.frintezza.isDead() && _world.activeScarlet != null && !_world.activeScarlet.isDead())
{
- List<L2Character> targetList = new FastList<L2Character>();
+ List<L2Character> targetList = new FastList<>();
if (skill.getSkillType() == L2SkillType.STUN || skill.getSkillType() == L2SkillType.DEBUFF)
{
for (int objId : _world.allowed)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
index 80fdef8998..0cd03e64da 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
@@ -363,7 +363,7 @@ public class PailakaDevilsLegacy extends Quest
// To be sure, reduce again
((L2Attackable) npc).reduceHate(player, 9999);
// Spawn followers
- _followerslist = new FastList<L2Npc>();
+ _followerslist = new FastList<>();
for (int[] SPAWN : FOLLOWERS_SPAWNS)
{
L2Npc _follower = addSpawn(FOLLOWERS, SPAWN[0], SPAWN[1], SPAWN[2], SPAWN[3], false, 0, true, player.getInstanceId());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
index 2df2c7827c..9f2c6a31e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
@@ -76,7 +76,7 @@ public class Stage1 extends Quest
{
private class SOD1World extends InstanceWorld
{
- public Map<L2Npc,Boolean> npcList = new FastMap<L2Npc,Boolean>();
+ public Map<L2Npc,Boolean> npcList = new FastMap<>();
public int deviceSpawnedMobCount = 0;
public Lock lock = new ReentrantLock();
@@ -104,9 +104,9 @@ public class Stage1 extends Quest
private static final int MAX_PLAYERS = 45;
private static final int MAX_DEVICESPAWNEDMOBCOUNT = 100; // prevent too much mob spawn
- private TIntObjectHashMap<L2Territory> _spawnZoneList = new TIntObjectHashMap<L2Territory>();
- private TIntObjectHashMap<List<SODSpawn>> _spawnList = new TIntObjectHashMap<List<SODSpawn>>();
- private List<Integer> _mustKillMobsId = new FastList<Integer>();
+ private TIntObjectHashMap<L2Territory> _spawnZoneList = new TIntObjectHashMap<>();
+ private TIntObjectHashMap<List<SODSpawn>> _spawnList = new TIntObjectHashMap<>();
+ private List<Integer> _mustKillMobsId = new FastList<>();
// teleports
private static final int[] ENTER_TELEPORT_1 = {-242759,219981,-9986};
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
index c9dbde3f1c..ec3a7b93c9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
@@ -53,7 +53,7 @@ public class HallOfSuffering extends Quest
private class HSWorld extends InstanceWorld
{
- public Map<L2Npc,Boolean> npcList = new FastMap<L2Npc,Boolean>();
+ public Map<L2Npc,Boolean> npcList = new FastMap<>();
public L2Npc klodekus = null;
public L2Npc klanikus = null;
public boolean isBossesAttacked = false;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
index ea318a8a91..a8a2ec6427 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
@@ -154,7 +154,7 @@ public class eventmodElpies extends Event
}
// Initialize list
- _npclist = new FastList<L2Npc>();
+ _npclist = new FastList<>();
// Set Event active
_isactive = true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
index 8c24ce2679..3b13d23d08 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
@@ -122,7 +122,7 @@ public class eventmodRabbits extends Event
}
// Initialize list
- _npclist = new FastList<L2Npc>();
+ _npclist = new FastList<>();
// Set Event active
_isactive = true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
index 75cfbbb8f0..222ee6ca42 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
@@ -129,8 +129,8 @@ public class eventmodRace extends Event
return false;
}
// Initialize list
- _npclist = new FastList<L2Npc>();
- _players = new FastList<L2PcInstance>();
+ _npclist = new FastList<>();
+ _players = new FastList<>();
// Set Event active
_isactive = true;
// Spawn Manager
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
index f6d3851bac..a347c17a8a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
@@ -14,7 +14,8 @@
*/
package quests.Q10276_MutatedKaneusGludio;
-import javolution.util.FastList;
+import java.util.ArrayList;
+import java.util.List;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -127,7 +128,7 @@ public class Q10276_MutatedKaneusGludio extends Quest
final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- final FastList<QuestState> PartyMembers = new FastList<QuestState>();
+ final List<QuestState> PartyMembers = new ArrayList<>();
for (L2PcInstance member : killer.getParty().getMembers())
{
st = member.getQuestState(qn);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
index e444f4b834..d011c65e03 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -14,7 +14,8 @@
*/
package quests.Q10277_MutatedKaneusDion;
-import javolution.util.FastList;
+import java.util.ArrayList;
+import java.util.List;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -127,7 +128,7 @@ public class Q10277_MutatedKaneusDion extends Quest
final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- final FastList<QuestState> PartyMembers = new FastList<QuestState>();
+ final List<QuestState> PartyMembers = new ArrayList<>();
for (L2PcInstance member : killer.getParty().getMembers())
{
st = member.getQuestState(qn);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
index 73b648f301..b5707f3d77 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
@@ -14,7 +14,8 @@
*/
package quests.Q10278_MutatedKaneusHeine;
-import javolution.util.FastList;
+import java.util.ArrayList;
+import java.util.List;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -127,7 +128,7 @@ public class Q10278_MutatedKaneusHeine extends Quest
final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- final FastList<QuestState> PartyMembers = new FastList<QuestState>();
+ final List<QuestState> PartyMembers = new ArrayList<>();
for (L2PcInstance member : killer.getParty().getMembers())
{
st = member.getQuestState(qn);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
index 04f22ba067..aa804f12ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -14,7 +14,8 @@
*/
package quests.Q10279_MutatedKaneusOren;
-import javolution.util.FastList;
+import java.util.ArrayList;
+import java.util.List;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -127,7 +128,7 @@ public class Q10279_MutatedKaneusOren extends Quest
final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- final FastList<QuestState> PartyMembers = new FastList<QuestState>();
+ final List<QuestState> PartyMembers = new ArrayList<>();
for (L2PcInstance member : killer.getParty().getMembers())
{
st = member.getQuestState(qn);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
index d951404540..877ae8c9e9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -14,7 +14,8 @@
*/
package quests.Q10280_MutatedKaneusSchuttgart;
-import javolution.util.FastList;
+import java.util.ArrayList;
+import java.util.List;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -127,7 +128,7 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- final FastList<QuestState> PartyMembers = new FastList<>();
+ final List<QuestState> PartyMembers = new ArrayList<>();
for (L2PcInstance member : killer.getParty().getMembers())
{
st = member.getQuestState(qn);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index 2eb66924d1..4bcc2e4eef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -14,7 +14,8 @@
*/
package quests.Q10281_MutatedKaneusRune;
-import javolution.util.FastList;
+import java.util.ArrayList;
+import java.util.List;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -127,7 +128,7 @@ public class Q10281_MutatedKaneusRune extends Quest
final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- final FastList<QuestState> PartyMembers = new FastList<QuestState>();
+ final List<QuestState> PartyMembers = new ArrayList<>();
for (L2PcInstance member : killer.getParty().getMembers())
{
st = member.getQuestState(qn);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q252_ItSmellsDelicious/Q252_ItSmellsDelicious.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q252_ItSmellsDelicious/Q252_ItSmellsDelicious.java
index d5bb8e56cc..72861d3648 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q252_ItSmellsDelicious/Q252_ItSmellsDelicious.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q252_ItSmellsDelicious/Q252_ItSmellsDelicious.java
@@ -14,7 +14,8 @@
*/
package quests.Q252_ItSmellsDelicious;
-import javolution.util.FastList;
+import java.util.ArrayList;
+import java.util.List;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Party;
@@ -191,7 +192,7 @@ public class Q252_ItSmellsDelicious extends Quest
return st;
}
- final FastList<QuestState> candidates = new FastList<QuestState>();
+ final List<QuestState> candidates = new ArrayList<>();
// get the target for enforcing distance limitations.
L2Object target = player.getTarget();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
index 204536e1a1..5301cab09c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
@@ -55,9 +55,9 @@ public class Q350_EnhanceYourWeapon extends Quest
private static final int GREEN_SOUL_CRYSTAL0_ID = 4640;
private static final int BLUE_SOUL_CRYSTAL0_ID = 4651;
- private final FastMap<Integer, SoulCrystal> _soulCrystals = new FastMap<Integer, SoulCrystal>();
+ private final FastMap<Integer, SoulCrystal> _soulCrystals = new FastMap<>();
// <npcid, <level, LevelingInfo>>
- private final FastMap<Integer, FastMap<Integer, LevelingInfo>> _npcLevelingInfos = new FastMap<Integer, FastMap<Integer, LevelingInfo>>();
+ private final FastMap<Integer, FastMap<Integer, LevelingInfo>> _npcLevelingInfos = new FastMap<>();
private static enum AbsorbCrystalType
{
@@ -208,7 +208,7 @@ public class Q350_EnhanceYourWeapon extends Quest
}
int npcId = Integer.parseInt(att.getNodeValue());
- FastMap<Integer, LevelingInfo> temp = new FastMap<Integer, LevelingInfo>();
+ FastMap<Integer, LevelingInfo> temp = new FastMap<>();
for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling())
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
index 8b869b5430..857069596a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
@@ -77,7 +77,7 @@ public final class Q511_AwlUnderFoot extends Quest
private static final long REENTERTIME = 14400000;
private static final long RAID_SPAWN_DELAY = 120000;
- private final TIntObjectHashMap<FortDungeon> _fortDungeons = new TIntObjectHashMap<FortDungeon>(21);
+ private final TIntObjectHashMap<FortDungeon> _fortDungeons = new TIntObjectHashMap<>(21);
// QUEST ITEMS
private static final int DL_MARK = 9797;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q691_MatrasSuspiciousRequest/Q691_MatrasSuspiciousRequest.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q691_MatrasSuspiciousRequest/Q691_MatrasSuspiciousRequest.java
index e87eee0a80..a17bec38a6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q691_MatrasSuspiciousRequest/Q691_MatrasSuspiciousRequest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q691_MatrasSuspiciousRequest/Q691_MatrasSuspiciousRequest.java
@@ -38,7 +38,7 @@ public final class Q691_MatrasSuspiciousRequest extends Quest
private static final int RED_GEM = 10372;
private static final int DYNASTY_SOUL_II = 10413;
- private static final Map<Integer, Integer> REWARD_CHANCES = new HashMap<Integer, Integer>();
+ private static final Map<Integer, Integer> REWARD_CHANCES = new HashMap<>();
static
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
index e5f3840e7e..014eb627c7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
@@ -36,7 +36,7 @@ import com.l2jserver.util.L2FastMap;
public class SagasSuperClass extends QuestJython
{
- private static L2FastList<Quest> _scripts = new L2FastList<Quest>();
+ private static L2FastList<Quest> _scripts = new L2FastList<>();
public String qn = "SagasSuperClass";
public int qnu;
public int[] NPC = {};
@@ -48,7 +48,7 @@ public class SagasSuperClass extends QuestJython
public int[] Y = {};
public int[] Z = {};
public String[] Text = {};
- L2FastMap<L2Npc, Integer> _SpawnList = new L2FastMap<L2Npc, Integer>();
+ L2FastMap<L2Npc, Integer> _SpawnList = new L2FastMap<>();
int[] QuestClass[] =
{
@@ -1062,7 +1062,7 @@ public class SagasSuperClass extends QuestJython
L2Party party = player.getParty();
if (party != null)
{
- L2FastList<QuestState> PartyQuestMembers = new L2FastList<QuestState>();
+ L2FastList<QuestState> PartyQuestMembers = new L2FastList<>();
for (L2PcInstance player1 : party.getMembers())
{
QuestState st1 = findQuest(player1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
index 16fce619b2..49269b01ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
@@ -37,9 +37,9 @@ import com.l2jserver.util.L2FastMap;
public class TerritoryWarSuperClass extends Quest
{
- private static L2FastMap<Integer, TerritoryWarSuperClass> _forTheSakeScripts = new L2FastMap<Integer, TerritoryWarSuperClass>();
- private static L2FastMap<Integer, TerritoryWarSuperClass> _protectTheScripts = new L2FastMap<Integer, TerritoryWarSuperClass>();
- private static L2FastMap<Integer, TerritoryWarSuperClass> _killTheScripts = new L2FastMap<Integer, TerritoryWarSuperClass>();
+ private static L2FastMap<Integer, TerritoryWarSuperClass> _forTheSakeScripts = new L2FastMap<>();
+ private static L2FastMap<Integer, TerritoryWarSuperClass> _protectTheScripts = new L2FastMap<>();
+ private static L2FastMap<Integer, TerritoryWarSuperClass> _killTheScripts = new L2FastMap<>();
public static String qn = "TerritoryWarSuperClass";
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java
index 9873d0e8c0..a81747eda5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java
@@ -34,7 +34,7 @@ public class NewbieTravelToken extends Quest
{
private static final int TOKEN = 8542;
//NPC Id - Teleport Location
- private static final Map<Integer, Location> DATA = new FastMap<Integer, Location>();
+ private static final Map<Integer, Location> DATA = new FastMap<>();
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToFantasy/TeleportToFantasy.java b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToFantasy/TeleportToFantasy.java
index 68d5ecb768..53c32594af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToFantasy/TeleportToFantasy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToFantasy/TeleportToFantasy.java
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcSay;
public class TeleportToFantasy extends Quest
{
private static final int PADDIES = 32378;
- private static final Map<Integer, Integer> TELEPORTERS = new FastMap<Integer, Integer>();
+ private static final Map<Integer, Integer> TELEPORTERS = new FastMap<>();
private static final Location[] RETURN_LOCS =
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToRaceTrack/TeleportToRaceTrack.java b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
index df3e362c6d..60b6a77497 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
@@ -33,7 +33,7 @@ public class TeleportToRaceTrack extends Quest
{
private static final int RACE_MANAGER = 30995;
- private static final Map<Integer, Integer> TELEPORTERS = new FastMap<Integer, Integer>();
+ private static final Map<Integer, Integer> TELEPORTERS = new FastMap<>();
private static final Location[] RETURN_LOCS =
{
--
GitLab