From c15bccc13f0dbba1a3fbe15988c8dddd587365e3 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 25 May 2021 02:59:41 +0000 Subject: [PATCH] Proper importing for map entries. --- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../gameserver/instancemanager/ClanHallManager.java | 7 ++++--- .../l2jmobius/gameserver/model/actor/Creature.java | 3 ++- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/residences/ClanHall.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../taskmanager/tasks/TaskRaidPointsReset.java | 3 ++- .../tools/gsregistering/GameServerRegister.java | 4 ++-- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../gameserver/instancemanager/ClanHallManager.java | 7 ++++--- .../l2jmobius/gameserver/model/actor/Creature.java | 3 ++- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/residences/ClanHall.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../taskmanager/tasks/TaskRaidPointsReset.java | 3 ++- .../SSQDisciplesNecropolisPast.java | 5 +++-- .../Q00258_BringWolfPelts.java | 3 ++- .../quests/Q00264_KeenClaws/Q00264_KeenClaws.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../gameserver/instancemanager/CHSiegeManager.java | 3 ++- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/instancemanager/ClanHallManager.java | 13 +++++++------ .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../SSQDisciplesNecropolisPast.java | 5 +++-- .../Q00258_BringWolfPelts.java | 3 ++- .../quests/Q00264_KeenClaws/Q00264_KeenClaws.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../gameserver/instancemanager/CHSiegeManager.java | 3 ++- .../instancemanager/CastleManorManager.java | 9 +++++---- .../gameserver/instancemanager/ClanHallManager.java | 13 +++++++------ .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../Q00258_BringWolfPelts.java | 3 ++- .../quests/Q00264_KeenClaws/Q00264_KeenClaws.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../Q00258_BringWolfPelts.java | 3 ++- .../quests/Q00264_KeenClaws/Q00264_KeenClaws.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../Q00258_BringWolfPelts.java | 3 ++- .../quests/Q00264_KeenClaws/Q00264_KeenClaws.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../Q00258_BringWolfPelts.java | 3 ++- .../quests/Q00264_KeenClaws/Q00264_KeenClaws.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../Q00258_BringWolfPelts.java | 3 ++- .../quests/Q00264_KeenClaws/Q00264_KeenClaws.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../Q00258_BringWolfPelts.java | 3 ++- .../quests/Q00264_KeenClaws/Q00264_KeenClaws.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- .../l2jmobius/gameserver/data/BotReportTable.java | 2 +- .../gameserver/data/SchemeBufferTable.java | 5 +++-- .../instancemanager/CastleManorManager.java | 9 +++++---- .../model/actor/instance/SchemeBufferInstance.java | 3 ++- .../gameserver/model/olympiad/OlympiadManager.java | 3 ++- .../model/options/OptionDataCategory.java | 3 ++- .../serverpackets/ExShowProcureCropDetail.java | 3 ++- .../network/serverpackets/PartyMemberPosition.java | 3 ++- 182 files changed, 435 insertions(+), 275 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java index 6c7daf4120..e8529b0176 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index f8ccf55310..f89ea497b6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java index 6c7daf4120..e8529b0176 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 384cfdc627..d53afe3ce4 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java index 6c7daf4120..e8529b0176 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 384cfdc627..d53afe3ce4 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java index 46e025bd3d..9dc72ba1e3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 5bcbd9deb4..d22b61753b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java index 9979f927c4..387bff01e0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 5bcbd9deb4..d22b61753b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java index 46e025bd3d..9dc72ba1e3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 33b6e3c5ee..934a9a4346 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java index 46e025bd3d..9dc72ba1e3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 33b6e3c5ee..934a9a4346 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java index 46e025bd3d..9dc72ba1e3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 15c1a36157..89a093b3a8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java index 46e025bd3d..9dc72ba1e3 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 15c1a36157..89a093b3a8 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 5f61309bd2..dd8d1e4281 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -43,7 +44,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java index 46e025bd3d..9dc72ba1e3 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 15c1a36157..89a093b3a8 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 5f61309bd2..dd8d1e4281 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -43,7 +44,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 47d44e5e4c..d6b09eb0b9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java index 363a18d24b..72641e230b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; @@ -211,7 +212,7 @@ public class ClanHallManager public ClanHall getNearbyClanHall(int x, int y, int maxDist) { ClanHallZone zone = null; - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -219,7 +220,7 @@ public class ClanHallManager return ch.getValue(); } } - for (Map.Entry ch : _freeClanHall.entrySet()) + for (Entry ch : _freeClanHall.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -236,7 +237,7 @@ public class ClanHallManager */ public ClanHall getClanHallByOwner(Clan clan) { - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { if (clan.getClanId() == ch.getValue().getOwnerId()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8752719f9b..6f4e56e108 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; @@ -261,7 +262,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder // Copy the skills of the NPCInstance from its template to the Creature Instance // The skills list can be affected by spell effects so it's necessary to make a copy to avoid that a spell affecting a NPCInstance, affects others NPCInstance of the same type too. _skills = ((NpcTemplate) template).getSkills(); - for (Map.Entry skill : _skills.entrySet()) + for (Entry skill : _skills.entrySet()) { addStatFuncs(skill.getValue().getStatFuncs(null, this)); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index e27985de84..aaec5d370c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -240,7 +241,7 @@ public class SchemeBufferInstance extends FolkInstance } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); StringUtil.append(sb, "", scheme.getKey(), " [", scheme.getValue().size(), " / ", player.getMaxBuffCount(), "]", ((cost > 0) ? " - cost: " + StringUtil.formatNumber(cost) : ""), ""); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index a5a207ea53..60acfafa7d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -461,7 +462,7 @@ public class ClanHall { _ownerId = 0; _isFree = true; - for (Map.Entry fc : _functions.entrySet()) + for (Entry fc : _functions.entrySet()) { removeFunction(fc.getKey()); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index f68ea52b31..98252ef1a6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(_locations.size()); - for (Map.Entry entry : _locations.entrySet()) + for (Entry entry : _locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java index 89bf4184ee..95bb6ae6c3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.taskmanager.tasks; import java.util.Calendar; import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -54,7 +55,7 @@ public class TaskRaidPointsReset extends Task final Map rankList = RaidBossPointsManager.getRankList(); for (Clan c : ClanTable.getInstance().getClans()) { - for (Map.Entry entry : rankList.entrySet()) + for (Entry entry : rankList.entrySet()) { final WorldObject obj = World.getInstance().findObject(entry.getKey()); if (obj instanceof PlayerInstance) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java index 78b07fab64..f2a137b919 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.LineNumberReader; import java.math.BigInteger; -import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -62,7 +62,7 @@ public class GameServerRegister if (_choice.equalsIgnoreCase("help")) { - for (Map.Entry entry : gameServerTable._serverNames.entrySet()) + for (Entry entry : gameServerTable._serverNames.entrySet()) { System.out.println("Server: id:" + entry.getKey() + " - " + entry.getValue()); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 47d44e5e4c..d6b09eb0b9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java index 363a18d24b..72641e230b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; @@ -211,7 +212,7 @@ public class ClanHallManager public ClanHall getNearbyClanHall(int x, int y, int maxDist) { ClanHallZone zone = null; - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -219,7 +220,7 @@ public class ClanHallManager return ch.getValue(); } } - for (Map.Entry ch : _freeClanHall.entrySet()) + for (Entry ch : _freeClanHall.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -236,7 +237,7 @@ public class ClanHallManager */ public ClanHall getClanHallByOwner(Clan clan) { - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { if (clan.getClanId() == ch.getValue().getOwnerId()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8ad26c6a68..2ac799c76f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; @@ -263,7 +264,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder // Copy the skills of the NPCInstance from its template to the Creature Instance // The skills list can be affected by spell effects so it's necessary to make a copy to avoid that a spell affecting a NPCInstance, affects others NPCInstance of the same type too. _skills = ((NpcTemplate) template).getSkills(); - for (Map.Entry skill : _skills.entrySet()) + for (Entry skill : _skills.entrySet()) { addStatFuncs(skill.getValue().getStatFuncs(null, this)); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index e27985de84..aaec5d370c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -240,7 +241,7 @@ public class SchemeBufferInstance extends FolkInstance } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); StringUtil.append(sb, "", scheme.getKey(), " [", scheme.getValue().size(), " / ", player.getMaxBuffCount(), "]", ((cost > 0) ? " - cost: " + StringUtil.formatNumber(cost) : ""), ""); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index a5a207ea53..60acfafa7d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -461,7 +462,7 @@ public class ClanHall { _ownerId = 0; _isFree = true; - for (Map.Entry fc : _functions.entrySet()) + for (Entry fc : _functions.entrySet()) { removeFunction(fc.getKey()); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index f68ea52b31..98252ef1a6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(_locations.size()); - for (Map.Entry entry : _locations.entrySet()) + for (Entry entry : _locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java index 89bf4184ee..95bb6ae6c3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.taskmanager.tasks; import java.util.Calendar; import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -54,7 +55,7 @@ public class TaskRaidPointsReset extends Task final Map rankList = RaidBossPointsManager.getRankList(); for (Clan c : ClanTable.getInstance().getClans()) { - for (Map.Entry entry : rankList.entrySet()) + for (Entry entry : rankList.entrySet()) { final WorldObject obj = World.getInstance().findObject(entry.getKey()); if (obj instanceof PlayerInstance) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java index bb79f77ef0..c547ed30cb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -127,13 +128,13 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance protected void spawnNPC(InstanceWorld world) { final List lilithGroup = new ArrayList<>(); - for (Map.Entry entry : LILITH_SPAWN.entrySet()) + for (Entry entry : LILITH_SPAWN.entrySet()) { lilithGroup.add(addSpawn(entry.getKey(), entry.getValue(), false, 0, false, world.getInstanceId())); } world.setParameter("lilithGroup", lilithGroup); final List anakimGroup = new ArrayList<>(); - for (Map.Entry entry : ANAKIM_SPAWN.entrySet()) + for (Entry entry : ANAKIM_SPAWN.entrySet()) { anakimGroup.add(addSpawn(entry.getKey(), entry.getValue(), false, 0, false, world.getInstanceId())); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index 99ba3f45b6..c65d0bbbd0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -18,6 +18,7 @@ package quests.Q00258_BringWolfPelts; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,7 +123,7 @@ public class Q00258_BringWolfPelts extends Quest if (getQuestItemsCount(player, WOLF_PELT) >= WOLF_PELT_COUNT) { final int chance = getRandom(16); - for (Map.Entry reward : REWARDS.entrySet()) + for (Entry reward : REWARDS.entrySet()) { if (chance < reward.getValue()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 071e2359ea..f246fe87b7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -129,7 +130,7 @@ public class Q00264_KeenClaws extends Quest if (getQuestItemsCount(player, WOLF_CLAW) >= WOLF_CLAW_COUNT) { final int chance = getRandom(17); - for (Map.Entry> reward : REWARDS.entrySet()) + for (Entry> reward : REWARDS.entrySet()) { if (chance < reward.getKey()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java index 4eda7064df..2d89ca2a35 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -190,7 +190,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 47d44e5e4c..d6b09eb0b9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java index a5e35f9d62..2339a81c8f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java @@ -21,6 +21,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -100,7 +101,7 @@ public class CHSiegeManager public SiegableHall getNearbyClanHall(int x, int y, int maxDist) { ClanHallZone zone = null; - for (Map.Entry ch : _siegableHalls.entrySet()) + for (Entry ch : _siegableHalls.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 9333a81109..ac09e3bbb2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.stream.Collectors; @@ -602,7 +603,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -617,7 +618,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -638,7 +639,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -654,7 +655,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java index 4d4183e338..282533a1e7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -21,6 +21,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -224,7 +225,7 @@ public class ClanHallManager public AuctionableHall getNearbyClanHall(int x, int y, int maxDist) { ClanHallZone zone = null; - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -232,7 +233,7 @@ public class ClanHallManager return ch.getValue(); } } - for (Map.Entry ch : _freeClanHall.entrySet()) + for (Entry ch : _freeClanHall.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -246,7 +247,7 @@ public class ClanHallManager public ClanHall getNearbyAbstractHall(int x, int y, int maxDist) { ClanHallZone zone = null; - for (Map.Entry ch : _allClanHalls.entrySet()) + for (Entry ch : _allClanHalls.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -263,7 +264,7 @@ public class ClanHallManager */ public AuctionableHall getClanHallByOwner(Clan clan) { - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { if (clan.getId() == ch.getValue().getOwnerId()) { @@ -276,14 +277,14 @@ public class ClanHallManager public ClanHall getAbstractHallByOwner(Clan clan) { // Separate loops to avoid iterating over free clan halls - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { if (clan.getId() == ch.getValue().getOwnerId()) { return ch.getValue(); } } - for (Map.Entry ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet()) + for (Entry ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet()) { if (clan.getId() == ch.getValue().getOwnerId()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 2a092364c0..5389997ee8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 2f51760e8b..b1c5c1b264 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -55,7 +56,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java index bb79f77ef0..c547ed30cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -127,13 +128,13 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance protected void spawnNPC(InstanceWorld world) { final List lilithGroup = new ArrayList<>(); - for (Map.Entry entry : LILITH_SPAWN.entrySet()) + for (Entry entry : LILITH_SPAWN.entrySet()) { lilithGroup.add(addSpawn(entry.getKey(), entry.getValue(), false, 0, false, world.getInstanceId())); } world.setParameter("lilithGroup", lilithGroup); final List anakimGroup = new ArrayList<>(); - for (Map.Entry entry : ANAKIM_SPAWN.entrySet()) + for (Entry entry : ANAKIM_SPAWN.entrySet()) { anakimGroup.add(addSpawn(entry.getKey(), entry.getValue(), false, 0, false, world.getInstanceId())); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index 99ba3f45b6..c65d0bbbd0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -18,6 +18,7 @@ package quests.Q00258_BringWolfPelts; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,7 +123,7 @@ public class Q00258_BringWolfPelts extends Quest if (getQuestItemsCount(player, WOLF_PELT) >= WOLF_PELT_COUNT) { final int chance = getRandom(16); - for (Map.Entry reward : REWARDS.entrySet()) + for (Entry reward : REWARDS.entrySet()) { if (chance < reward.getValue()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 071e2359ea..f246fe87b7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -129,7 +130,7 @@ public class Q00264_KeenClaws extends Quest if (getQuestItemsCount(player, WOLF_CLAW) >= WOLF_CLAW_COUNT) { final int chance = getRandom(17); - for (Map.Entry> reward : REWARDS.entrySet()) + for (Entry> reward : REWARDS.entrySet()) { if (chance < reward.getKey()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java index 4eda7064df..2d89ca2a35 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -190,7 +190,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 47d44e5e4c..d6b09eb0b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java index a5e35f9d62..2339a81c8f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java @@ -21,6 +21,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -100,7 +101,7 @@ public class CHSiegeManager public SiegableHall getNearbyClanHall(int x, int y, int maxDist) { ClanHallZone zone = null; - for (Map.Entry ch : _siegableHalls.entrySet()) + for (Entry ch : _siegableHalls.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 9333a81109..ac09e3bbb2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.stream.Collectors; @@ -602,7 +603,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -617,7 +618,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -638,7 +639,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -654,7 +655,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java index 4d4183e338..282533a1e7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -21,6 +21,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -224,7 +225,7 @@ public class ClanHallManager public AuctionableHall getNearbyClanHall(int x, int y, int maxDist) { ClanHallZone zone = null; - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -232,7 +233,7 @@ public class ClanHallManager return ch.getValue(); } } - for (Map.Entry ch : _freeClanHall.entrySet()) + for (Entry ch : _freeClanHall.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -246,7 +247,7 @@ public class ClanHallManager public ClanHall getNearbyAbstractHall(int x, int y, int maxDist) { ClanHallZone zone = null; - for (Map.Entry ch : _allClanHalls.entrySet()) + for (Entry ch : _allClanHalls.entrySet()) { zone = ch.getValue().getZone(); if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) @@ -263,7 +264,7 @@ public class ClanHallManager */ public AuctionableHall getClanHallByOwner(Clan clan) { - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { if (clan.getId() == ch.getValue().getOwnerId()) { @@ -276,14 +277,14 @@ public class ClanHallManager public ClanHall getAbstractHallByOwner(Clan clan) { // Separate loops to avoid iterating over free clan halls - for (Map.Entry ch : _clanHall.entrySet()) + for (Entry ch : _clanHall.entrySet()) { if (clan.getId() == ch.getValue().getOwnerId()) { return ch.getValue(); } } - for (Map.Entry ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet()) + for (Entry ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet()) { if (clan.getId() == ch.getValue().getOwnerId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 2a092364c0..5389997ee8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 154a6e80e4..66f606d367 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.olympiad; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; @@ -72,7 +73,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 2f51760e8b..b1c5c1b264 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -55,7 +56,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index f22cac0792..d9b233c930 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -18,6 +18,7 @@ package quests.Q00258_BringWolfPelts; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +121,7 @@ public class Q00258_BringWolfPelts extends Quest if (getQuestItemsCount(player, WOLF_PELT) >= WOLF_PELT_COUNT) { final int chance = getRandom(16); - for (Map.Entry reward : REWARDS.entrySet()) + for (Entry reward : REWARDS.entrySet()) { if (chance < reward.getValue()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 04d2db5cfc..9528416f7c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -125,7 +126,7 @@ public class Q00264_KeenClaws extends Quest if (getQuestItemsCount(player, WOLF_CLAW) >= WOLF_CLAW_COUNT) { final int chance = getRandom(17); - for (Map.Entry> reward : REWARDS.entrySet()) + for (Entry> reward : REWARDS.entrySet()) { if (chance < reward.getKey()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java index e70800c015..4f59a1cd9b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 5e55ac0979..3ff447bc23 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index f22cac0792..d9b233c930 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -18,6 +18,7 @@ package quests.Q00258_BringWolfPelts; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +121,7 @@ public class Q00258_BringWolfPelts extends Quest if (getQuestItemsCount(player, WOLF_PELT) >= WOLF_PELT_COUNT) { final int chance = getRandom(16); - for (Map.Entry reward : REWARDS.entrySet()) + for (Entry reward : REWARDS.entrySet()) { if (chance < reward.getValue()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 04d2db5cfc..9528416f7c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -125,7 +126,7 @@ public class Q00264_KeenClaws extends Quest if (getQuestItemsCount(player, WOLF_CLAW) >= WOLF_CLAW_COUNT) { final int chance = getRandom(17); - for (Map.Entry> reward : REWARDS.entrySet()) + for (Entry> reward : REWARDS.entrySet()) { if (chance < reward.getKey()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java index e70800c015..4f59a1cd9b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 5e55ac0979..3ff447bc23 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index f22cac0792..d9b233c930 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -18,6 +18,7 @@ package quests.Q00258_BringWolfPelts; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +121,7 @@ public class Q00258_BringWolfPelts extends Quest if (getQuestItemsCount(player, WOLF_PELT) >= WOLF_PELT_COUNT) { final int chance = getRandom(16); - for (Map.Entry reward : REWARDS.entrySet()) + for (Entry reward : REWARDS.entrySet()) { if (chance < reward.getValue()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 04d2db5cfc..9528416f7c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -125,7 +126,7 @@ public class Q00264_KeenClaws extends Quest if (getQuestItemsCount(player, WOLF_CLAW) >= WOLF_CLAW_COUNT) { final int chance = getRandom(17); - for (Map.Entry> reward : REWARDS.entrySet()) + for (Entry> reward : REWARDS.entrySet()) { if (chance < reward.getKey()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java index e70800c015..4f59a1cd9b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 5e55ac0979..3ff447bc23 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index f22cac0792..d9b233c930 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -18,6 +18,7 @@ package quests.Q00258_BringWolfPelts; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +121,7 @@ public class Q00258_BringWolfPelts extends Quest if (getQuestItemsCount(player, WOLF_PELT) >= WOLF_PELT_COUNT) { final int chance = getRandom(16); - for (Map.Entry reward : REWARDS.entrySet()) + for (Entry reward : REWARDS.entrySet()) { if (chance < reward.getValue()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 04d2db5cfc..9528416f7c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -125,7 +126,7 @@ public class Q00264_KeenClaws extends Quest if (getQuestItemsCount(player, WOLF_CLAW) >= WOLF_CLAW_COUNT) { final int chance = getRandom(17); - for (Map.Entry> reward : REWARDS.entrySet()) + for (Entry> reward : REWARDS.entrySet()) { if (chance < reward.getKey()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java index e70800c015..4f59a1cd9b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 5e55ac0979..3ff447bc23 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index f22cac0792..d9b233c930 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -18,6 +18,7 @@ package quests.Q00258_BringWolfPelts; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +121,7 @@ public class Q00258_BringWolfPelts extends Quest if (getQuestItemsCount(player, WOLF_PELT) >= WOLF_PELT_COUNT) { final int chance = getRandom(16); - for (Map.Entry reward : REWARDS.entrySet()) + for (Entry reward : REWARDS.entrySet()) { if (chance < reward.getValue()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 04d2db5cfc..9528416f7c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -125,7 +126,7 @@ public class Q00264_KeenClaws extends Quest if (getQuestItemsCount(player, WOLF_CLAW) >= WOLF_CLAW_COUNT) { final int chance = getRandom(17); - for (Map.Entry> reward : REWARDS.entrySet()) + for (Entry> reward : REWARDS.entrySet()) { if (chance < reward.getKey()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java index e70800c015..4f59a1cd9b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 5e55ac0979..3ff447bc23 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java index e70800c015..4f59a1cd9b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index f56e72282c..9061aecb5a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index f22cac0792..d9b233c930 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -18,6 +18,7 @@ package quests.Q00258_BringWolfPelts; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +121,7 @@ public class Q00258_BringWolfPelts extends Quest if (getQuestItemsCount(player, WOLF_PELT) >= WOLF_PELT_COUNT) { final int chance = getRandom(16); - for (Map.Entry reward : REWARDS.entrySet()) + for (Entry reward : REWARDS.entrySet()) { if (chance < reward.getValue()) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 04d2db5cfc..9528416f7c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; @@ -125,7 +126,7 @@ public class Q00264_KeenClaws extends Quest if (getQuestItemsCount(player, WOLF_CLAW) >= WOLF_CLAW_COUNT) { final int chance = getRandom(17); - for (Map.Entry> reward : REWARDS.entrySet()) + for (Entry> reward : REWARDS.entrySet()) { if (chance < reward.getKey()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java index e70800c015..4f59a1cd9b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 5e55ac0979..3ff447bc23 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 22a2639a57..8682ff23eb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -40,7 +41,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java index 4bf4547acb..5eeb2a1a21 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 938e7c05e0..6f9fd9c00c 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 5f61309bd2..dd8d1e4281 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -43,7 +44,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey()); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/BotReportTable.java index 4bf4547acb..5eeb2a1a21 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -189,7 +189,7 @@ public class BotReportTable { st.execute(SQL_CLEAR_REPORTED_CHAR_DATA); - for (Map.Entry entrySet : _reports.entrySet()) + for (Entry entrySet : _reports.entrySet()) { for (int reporterId : entrySet.getValue()._reporters.keySet()) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java index 76d71a1040..f2e1bbd15b 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -139,9 +140,9 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Entry>> player : _schemesTable.entrySet()) { - for (Map.Entry> scheme : player.getValue().entrySet()) + for (Entry> scheme : player.getValue().entrySet()) { // Build a String composed of skill ids seperated by a ",". final StringBuilder sb = new StringBuilder(); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 213b605442..28982afb57 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -606,7 +607,7 @@ public class CastleManorManager implements IXmlReader, IStorable ds.executeUpdate(); // Current production - for (Map.Entry> entry : _production.entrySet()) + for (Entry> entry : _production.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next production - for (Map.Entry> entry : _productionNext.entrySet()) + for (Entry> entry : _productionNext.entrySet()) { for (SeedProduction sp : entry.getValue()) { @@ -642,7 +643,7 @@ public class CastleManorManager implements IXmlReader, IStorable dp.executeUpdate(); // Current procure - for (Map.Entry> entry : _procure.entrySet()) + for (Entry> entry : _procure.entrySet()) { for (CropProcure cp : entry.getValue()) { @@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable } // Next procure - for (Map.Entry> entry : _procureNext.entrySet()) + for (Entry> entry : _procureNext.entrySet()) { for (CropProcure cp : entry.getValue()) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 26b5210a49..1fb4121927 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.StringTokenizer; import org.l2jmobius.Config; @@ -256,7 +257,7 @@ public class SchemeBufferInstance extends Npc } else { - for (Map.Entry> scheme : schemes.entrySet()) + for (Entry> scheme : schemes.entrySet()) { final int cost = getFee(scheme.getValue()); sb.append("" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + ""); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 938e7c05e0..6f9fd9c00c 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -62,7 +63,7 @@ public class OlympiadManager protected final List> hasEnoughRegisteredClassed() { List> result = null; - for (Map.Entry> classList : _classBasedRegisters.entrySet()) + for (Entry> classList : _classBasedRegisters.entrySet()) { if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED)) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java index 5f61309bd2..dd8d1e4281 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.options; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; @@ -43,7 +44,7 @@ public class OptionDataCategory do { double random = Rnd.nextDouble() * 100.0; - for (Map.Entry entry : _options.entrySet()) + for (Entry entry : _options.entrySet()) { if (entry.getValue() >= random) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 3e3765eed2..1d3312d668 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -55,7 +56,7 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Map.Entry entry : _castleCrops.entrySet()) + for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); packet.writeD(entry.getKey()); // manor name diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 08451123e2..840268f8fc 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Location; @@ -56,7 +57,7 @@ public class PartyMemberPosition implements IClientOutgoingPacket OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(locations.size()); - for (Map.Entry entry : locations.entrySet()) + for (Entry entry : locations.entrySet()) { final Location loc = entry.getValue(); packet.writeD(entry.getKey());