From f3cc2bf205ecf9e75548f4e42f8230f58ddd4fc1 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 25 Oct 2019 22:15:46 +0000 Subject: [PATCH] Fixed duplicate key exception in buffer schemes. Contributed by Sahar. --- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- .../gameserver/datatables/SchemeBufferTable.java | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 08f2fdf20b..f4b97dfc35 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -51,7 +51,7 @@ public class SchemeBufferTable private static final String DELETE_SCHEMES = "TRUNCATE TABLE buffer_schemes"; private static final String INSERT_SCHEME = "INSERT INTO buffer_schemes (object_id, scheme_name, skills) VALUES (?,?,?)"; - private final Map>> _schemesTable = new ConcurrentHashMap<>(); + private final Map>> _schemesTable = new ConcurrentHashMap<>(); private final Map _availableBuffs = new LinkedHashMap<>(); public SchemeBufferTable() @@ -146,7 +146,7 @@ public class SchemeBufferTable // Save _schemesTable content. try (PreparedStatement st = con.prepareStatement(INSERT_SCHEME)) { - for (Map.Entry>> player : _schemesTable.entrySet()) + for (Map.Entry>> player : _schemesTable.entrySet()) { for (Map.Entry> scheme : player.getValue().entrySet()) { @@ -182,7 +182,7 @@ public class SchemeBufferTable { if (!_schemesTable.containsKey(playerId)) { - _schemesTable.put(playerId, new HashMap<>()); + _schemesTable.put(playerId, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } else if (_schemesTable.get(playerId).size() >= Config.BUFFER_MAX_SCHEMES) {