Proper importing for map entries.

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -621,7 +622,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -658,7 +659,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Set<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<Set<Integer>> result = null;
-		for (Map.Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, Set<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Options, Double> entry : _options.entrySet())
+			for (Entry<Options, Double> entry : _options.entrySet())
 			{
 				if (entry.getValue() >= random)
 				{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, Map<String, List<Integer>>> player : _schemesTable.entrySet())
+				for (Entry<Integer, Map<String, List<Integer>>> player : _schemesTable.entrySet())
 				{
-					for (Map.Entry<String, List<Integer>> scheme : player.getValue().entrySet())
+					for (Entry<String, List<Integer>> scheme : player.getValue().entrySet())
 					{
 						// Build a String composed of skill ids seperated by a ",".
 						final StringBuilder sb = new StringBuilder();

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<Integer, ClanHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, ClanHall> 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<Integer, ClanHall> ch : _freeClanHall.entrySet())
+		for (Entry<Integer, ClanHall> 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<Integer, ClanHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, ClanHall> ch : _clanHall.entrySet())
 		{
 			if (clan.getClanId() == ch.getValue().getOwnerId())
 			{

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<Integer, Skill> skill : _skills.entrySet())
+			for (Entry<Integer, Skill> skill : _skills.entrySet())
 			{
 				addStatFuncs(skill.getValue().getStatFuncs(null, this));
 			}

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<String, List<Integer>> scheme : schemes.entrySet())
+			for (Entry<String, List<Integer>> scheme : schemes.entrySet())
 			{
 				final int cost = getFee(scheme.getValue());
 				StringUtil.append(sb, "<font color=\"LEVEL\">", scheme.getKey(), " [", scheme.getValue().size(), " / ", player.getMaxBuffCount(), "]", ((cost > 0) ? " - cost: " + StringUtil.formatNumber(cost) : ""), "</font><br1>");

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<Integer, ClanHallFunction> fc : _functions.entrySet())
+		for (Entry<Integer, ClanHallFunction> fc : _functions.entrySet())
 		{
 			removeFunction(fc.getKey());
 		}

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<Integer, Location> entry : _locations.entrySet())
+		for (Entry<Integer, Location> entry : _locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, Integer> rankList = RaidBossPointsManager.getRankList();
 			for (Clan c : ClanTable.getInstance().getClans())
 			{
-				for (Map.Entry<Integer, Integer> entry : rankList.entrySet())
+				for (Entry<Integer, Integer> entry : rankList.entrySet())
 				{
 					final WorldObject obj = World.getInstance().findObject(entry.getKey());
 					if (obj instanceof PlayerInstance)

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<Integer, String> entry : gameServerTable._serverNames.entrySet())
+					for (Entry<Integer, String> entry : gameServerTable._serverNames.entrySet())
 					{
 						System.out.println("Server: id:" + entry.getKey() + " - " + entry.getValue());
 					}

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<Integer, Map<String, List<Integer>>> player : _schemesTable.entrySet())
+				for (Entry<Integer, Map<String, List<Integer>>> player : _schemesTable.entrySet())
 				{
-					for (Map.Entry<String, List<Integer>> scheme : player.getValue().entrySet())
+					for (Entry<String, List<Integer>> scheme : player.getValue().entrySet())
 					{
 						// Build a String composed of skill ids seperated by a ",".
 						final StringBuilder sb = new StringBuilder();

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<Integer, ClanHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, ClanHall> 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<Integer, ClanHall> ch : _freeClanHall.entrySet())
+		for (Entry<Integer, ClanHall> 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<Integer, ClanHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, ClanHall> ch : _clanHall.entrySet())
 		{
 			if (clan.getClanId() == ch.getValue().getOwnerId())
 			{

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<Integer, Skill> skill : _skills.entrySet())
+			for (Entry<Integer, Skill> skill : _skills.entrySet())
 			{
 				addStatFuncs(skill.getValue().getStatFuncs(null, this));
 			}

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<String, List<Integer>> scheme : schemes.entrySet())
+			for (Entry<String, List<Integer>> scheme : schemes.entrySet())
 			{
 				final int cost = getFee(scheme.getValue());
 				StringUtil.append(sb, "<font color=\"LEVEL\">", scheme.getKey(), " [", scheme.getValue().size(), " / ", player.getMaxBuffCount(), "]", ((cost > 0) ? " - cost: " + StringUtil.formatNumber(cost) : ""), "</font><br1>");

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<Integer, ClanHallFunction> fc : _functions.entrySet())
+		for (Entry<Integer, ClanHallFunction> fc : _functions.entrySet())
 		{
 			removeFunction(fc.getKey());
 		}

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<Integer, Location> entry : _locations.entrySet())
+		for (Entry<Integer, Location> entry : _locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, Integer> rankList = RaidBossPointsManager.getRankList();
 			for (Clan c : ClanTable.getInstance().getClans())
 			{
-				for (Map.Entry<Integer, Integer> entry : rankList.entrySet())
+				for (Entry<Integer, Integer> entry : rankList.entrySet())
 				{
 					final WorldObject obj = World.getInstance().findObject(entry.getKey());
 					if (obj instanceof PlayerInstance)

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<Npc> lilithGroup = new ArrayList<>();
-		for (Map.Entry<Integer, Location> entry : LILITH_SPAWN.entrySet())
+		for (Entry<Integer, Location> entry : LILITH_SPAWN.entrySet())
 		{
 			lilithGroup.add(addSpawn(entry.getKey(), entry.getValue(), false, 0, false, world.getInstanceId()));
 		}
 		world.setParameter("lilithGroup", lilithGroup);
 		final List<Npc> anakimGroup = new ArrayList<>();
-		for (Map.Entry<Integer, Location> entry : ANAKIM_SPAWN.entrySet())
+		for (Entry<Integer, Location> entry : ANAKIM_SPAWN.entrySet())
 		{
 			anakimGroup.add(addSpawn(entry.getKey(), entry.getValue(), false, 0, false, world.getInstanceId()));
 		}

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<Integer, Integer> reward : REWARDS.entrySet())
+							for (Entry<Integer, Integer> reward : REWARDS.entrySet())
 							{
 								if (chance < reward.getValue())
 								{

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<Integer, List<ItemHolder>> reward : REWARDS.entrySet())
+							for (Entry<Integer, List<ItemHolder>> reward : REWARDS.entrySet())
 							{
 								if (chance < reward.getKey())
 								{

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, Map<String, List<Integer>>> player : _schemesTable.entrySet())
+				for (Entry<Integer, Map<String, List<Integer>>> player : _schemesTable.entrySet())
 				{
-					for (Map.Entry<String, List<Integer>> scheme : player.getValue().entrySet())
+					for (Entry<String, List<Integer>> scheme : player.getValue().entrySet())
 					{
 						// Build a String composed of skill ids seperated by a ",".
 						final StringBuilder sb = new StringBuilder();

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<Integer, SiegableHall> ch : _siegableHalls.entrySet())
+		for (Entry<Integer, SiegableHall> ch : _siegableHalls.entrySet())
 		{
 			zone = ch.getValue().getZone();
 			if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist))

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -617,7 +618,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -654,7 +655,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Integer, AuctionableHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, AuctionableHall> 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<Integer, AuctionableHall> ch : _freeClanHall.entrySet())
+		for (Entry<Integer, AuctionableHall> 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<Integer, ClanHall> ch : _allClanHalls.entrySet())
+		for (Entry<Integer, ClanHall> 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<Integer, AuctionableHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, AuctionableHall> 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<Integer, AuctionableHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, AuctionableHall> ch : _clanHall.entrySet())
 		{
 			if (clan.getId() == ch.getValue().getOwnerId())
 			{
 				return ch.getValue();
 			}
 		}
-		for (Map.Entry<Integer, SiegableHall> ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet())
+		for (Entry<Integer, SiegableHall> ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet())
 		{
 			if (clan.getId() == ch.getValue().getOwnerId())
 			{

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<String, List<Integer>> scheme : schemes.entrySet())
+			for (Entry<String, List<Integer>> scheme : schemes.entrySet())
 			{
 				final int cost = getFee(scheme.getValue());
 				sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Npc> lilithGroup = new ArrayList<>();
-		for (Map.Entry<Integer, Location> entry : LILITH_SPAWN.entrySet())
+		for (Entry<Integer, Location> entry : LILITH_SPAWN.entrySet())
 		{
 			lilithGroup.add(addSpawn(entry.getKey(), entry.getValue(), false, 0, false, world.getInstanceId()));
 		}
 		world.setParameter("lilithGroup", lilithGroup);
 		final List<Npc> anakimGroup = new ArrayList<>();
-		for (Map.Entry<Integer, Location> entry : ANAKIM_SPAWN.entrySet())
+		for (Entry<Integer, Location> entry : ANAKIM_SPAWN.entrySet())
 		{
 			anakimGroup.add(addSpawn(entry.getKey(), entry.getValue(), false, 0, false, world.getInstanceId()));
 		}

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<Integer, Integer> reward : REWARDS.entrySet())
+							for (Entry<Integer, Integer> reward : REWARDS.entrySet())
 							{
 								if (chance < reward.getValue())
 								{

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<Integer, List<ItemHolder>> reward : REWARDS.entrySet())
+							for (Entry<Integer, List<ItemHolder>> reward : REWARDS.entrySet())
 							{
 								if (chance < reward.getKey())
 								{

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<Integer, ReportedCharData> entrySet : _reports.entrySet())
+			for (Entry<Integer, ReportedCharData> entrySet : _reports.entrySet())
 			{
 				for (int reporterId : entrySet.getValue()._reporters.keySet())
 				{

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<Integer, Map<String, List<Integer>>> player : _schemesTable.entrySet())
+				for (Entry<Integer, Map<String, List<Integer>>> player : _schemesTable.entrySet())
 				{
-					for (Map.Entry<String, List<Integer>> scheme : player.getValue().entrySet())
+					for (Entry<String, List<Integer>> scheme : player.getValue().entrySet())
 					{
 						// Build a String composed of skill ids seperated by a ",".
 						final StringBuilder sb = new StringBuilder();

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<Integer, SiegableHall> ch : _siegableHalls.entrySet())
+		for (Entry<Integer, SiegableHall> ch : _siegableHalls.entrySet())
 		{
 			zone = ch.getValue().getZone();
 			if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist))

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<Integer, List<SeedProduction>> entry : _production.entrySet())
+			for (Entry<Integer, List<SeedProduction>> entry : _production.entrySet())
 			{
 				for (SeedProduction sp : entry.getValue())
 				{
@@ -617,7 +618,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next production
-			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet())
+			for (Entry<Integer, List<SeedProduction>> 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<Integer, List<CropProcure>> entry : _procure.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procure.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{
@@ -654,7 +655,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 			}
 			
 			// Next procure
-			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
+			for (Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet())
 			{
 				for (CropProcure cp : entry.getValue())
 				{

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<Integer, AuctionableHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, AuctionableHall> 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<Integer, AuctionableHall> ch : _freeClanHall.entrySet())
+		for (Entry<Integer, AuctionableHall> 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<Integer, ClanHall> ch : _allClanHalls.entrySet())
+		for (Entry<Integer, ClanHall> 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<Integer, AuctionableHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, AuctionableHall> 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<Integer, AuctionableHall> ch : _clanHall.entrySet())
+		for (Entry<Integer, AuctionableHall> ch : _clanHall.entrySet())
 		{
 			if (clan.getId() == ch.getValue().getOwnerId())
 			{
 				return ch.getValue();
 			}
 		}
-		for (Map.Entry<Integer, SiegableHall> ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet())
+		for (Entry<Integer, SiegableHall> ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet())
 		{
 			if (clan.getId() == ch.getValue().getOwnerId())
 			{

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<String, List<Integer>> scheme : schemes.entrySet())
+			for (Entry<String, List<Integer>> scheme : schemes.entrySet())
 			{
 				final int cost = getFee(scheme.getValue());
 				sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");

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<List<Integer>> hasEnoughRegisteredClassed()
 	{
 		List<List<Integer>> result = null;
-		for (Map.Entry<Integer, List<Integer>> classList : _classBasedRegisters.entrySet())
+		for (Entry<Integer, List<Integer>> classList : _classBasedRegisters.entrySet())
 		{
 			if ((classList.getValue() != null) && (classList.getValue().size() >= Config.ALT_OLY_CLASSED))
 			{

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<Integer, CropProcure> entry : _castleCrops.entrySet())
+		for (Entry<Integer, CropProcure> entry : _castleCrops.entrySet())
 		{
 			final CropProcure crop = entry.getValue();
 			packet.writeD(entry.getKey()); // manor name

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<Integer, Location> entry : locations.entrySet())
+		for (Entry<Integer, Location> entry : locations.entrySet())
 		{
 			final Location loc = entry.getValue();
 			packet.writeD(entry.getKey());

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<Integer, Integer> reward : REWARDS.entrySet())
+							for (Entry<Integer, Integer> reward : REWARDS.entrySet())
 							{
 								if (chance < reward.getValue())
 								{

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<Integer, List<ItemHolder>> reward : REWARDS.entrySet())
+							for (Entry<Integer, List<ItemHolder>> reward : REWARDS.entrySet())
 							{
 								if (chance < reward.getKey())
 								{