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

Proper importing for map entries.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-05-25 02:59:41 +00:00
parent bf4066d68e
commit c15bccc13f
182 changed files with 435 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java
View File

@@ -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())
{

5
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/SchemeBufferTable.java
View File

@@ -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();

9
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
View File

@@ -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())
{

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -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>");

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
View File

@@ -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))
{

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/options/OptionDataCategory.java
View File

@@ -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)
{

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
View File

@@ -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

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
View File

@@ -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());