From d7f2b9f9a646f5e0c8605c752b500390411a1fd3 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 17 Oct 2021 17:36:12 +0000 Subject: [PATCH] Attendance rewards can be shared by account. Contributed by nasseka. --- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- .../instancemanager/DailyTaskManager.java | 60 ++++++++++++++----- 18 files changed, 792 insertions(+), 288 deletions(-) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 7f4d5508b2..ed2ac85cd5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -262,28 +262,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 7f4d5508b2..ed2ac85cd5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -262,28 +262,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 7f4d5508b2..ed2ac85cd5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -262,28 +262,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 42d53469b4..44ed221bb1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -255,28 +255,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 42d53469b4..44ed221bb1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -255,28 +255,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 42d53469b4..44ed221bb1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -255,28 +255,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index aa150ea1fe..e5de7ea92f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -328,28 +328,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index b4a6fda9d2..6d10f49e12 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -442,28 +442,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index b4a6fda9d2..6d10f49e12 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -442,28 +442,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 58596e32ee..b9077cd786 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -283,28 +283,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 58596e32ee..b9077cd786 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -283,28 +283,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 58596e32ee..b9077cd786 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -283,28 +283,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 58596e32ee..b9077cd786 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -283,28 +283,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 58596e32ee..b9077cd786 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -283,28 +283,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index f2027ee53c..9ab8d9bdb8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -356,28 +356,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 7f4d5508b2..ed2ac85cd5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -262,28 +262,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 2671a55821..90f591c76d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -426,28 +426,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index e1670e00ed..070586c94a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -457,28 +457,56 @@ public class DailyTaskManager extends AbstractEventManager> public void onResetAttendanceRewards() { - // Update data for offline players. - try (Connection con = DatabaseFactory.getConnection()) + if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) { - ps.setString(1, PlayerVariables.ATTENDANCE_DATE); - ps.execute(); + try (PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?")) + { + ps.setString(1, "ATTENDANCE_DATE"); + ps.execute(); + } } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getAccountVariables().remove("ATTENDANCE_DATE"); + player.getAccountVariables().storeMe(); + } + + LOGGER.info("Account shared Attendance Rewards has been resetted."); } - catch (Exception e) + else { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection()) + { + try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); + ps.execute(); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Attendance Rewards: " + e); + } + + // Update data for online players. + for (PlayerInstance player : World.getInstance().getPlayers()) + { + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); + player.getVariables().storeMe(); + } + + LOGGER.info("Attendance Rewards has been resetted."); } - - // Update data for online players. - for (PlayerInstance player : World.getInstance().getPlayers()) - { - player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); - player.getVariables().storeMe(); - } - - LOGGER.info("Attendance Rewards has been resetted."); } public static DailyTaskManager getInstance()