From c6b2a5870fdccad79e7b5b57e86889b43c2fdb54 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 23 Apr 2022 08:51:21 +0000 Subject: [PATCH] PremiumManager case sensitive account adjustments. --- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- .../instancemanager/PremiumManager.java | 22 +++++++++---------- 26 files changed, 286 insertions(+), 286 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5e348183a3..cd8ba0e7c1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5e348183a3..cd8ba0e7c1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5e348183a3..cd8ba0e7c1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5e348183a3..cd8ba0e7c1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5e348183a3..cd8ba0e7c1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5e348183a3..cd8ba0e7c1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5e348183a3..cd8ba0e7c1 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5e348183a3..cd8ba0e7c1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 83571c6dda..8bd7b3c49d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -109,7 +109,7 @@ public class PremiumManager */ private void startExpireTask(Player player, long delay) { - _expiretasks.put(player.getAccountName(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); + _expiretasks.put(player.getAccountName().toLowerCase(), ThreadPool.schedule(new PremiumExpireTask(player), delay)); } /** @@ -117,7 +117,7 @@ public class PremiumManager */ private void stopExpireTask(Player player) { - ScheduledFuture task = _expiretasks.remove(player.getAccountName()); + ScheduledFuture task = _expiretasks.remove(player.getAccountName().toLowerCase()); if (task != null) { task.cancel(false); @@ -130,12 +130,12 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(LOAD_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); try (ResultSet rset = stmt.executeQuery()) { while (rset.next()) { - _premiumData.put(rset.getString(1), rset.getLong(2)); + _premiumData.put(rset.getString(1).toLowerCase(), rset.getLong(2)); } } } @@ -147,7 +147,7 @@ public class PremiumManager public long getPremiumExpiration(String accountName) { - return _premiumData.getOrDefault(accountName, 0L); + return _premiumData.getOrDefault(accountName.toLowerCase(), 0L); } public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) @@ -162,7 +162,7 @@ public class PremiumManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(UPDATE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.setLong(2, newPremiumExpiration); stmt.execute(); } @@ -172,12 +172,12 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.put(accountName, newPremiumExpiration); + _premiumData.put(accountName.toLowerCase(), newPremiumExpiration); // UPDATE PlAYER PREMIUMSTATUS for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName())) + if (accountName.equalsIgnoreCase(player.getAccountName())) { stopExpireTask(player); startExpireTask(player, newPremiumExpiration - now); @@ -196,7 +196,7 @@ public class PremiumManager { for (Player player : World.getInstance().getPlayers()) { - if (accountName.equals(player.getAccountName()) && player.hasPremiumStatus()) + if (accountName.equalsIgnoreCase(player.getAccountName()) && player.hasPremiumStatus()) { player.setPremiumStatus(false); stopExpireTask(player); @@ -206,13 +206,13 @@ public class PremiumManager } // UPDATE CACHE - _premiumData.remove(accountName); + _premiumData.remove(accountName.toLowerCase()); // UPDATE DATABASE try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stmt = con.prepareStatement(DELETE_SQL)) { - stmt.setString(1, accountName); + stmt.setString(1, accountName.toLowerCase()); stmt.execute(); } catch (SQLException e)