diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 4207804752..7f4d5508b2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -267,7 +267,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -279,7 +279,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 75f1d92e47..7ef197352b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -845,10 +845,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = new int[] @@ -14189,13 +14185,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14225,13 +14221,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 98cd208eaf..da5318c520 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 4207804752..7f4d5508b2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -267,7 +267,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -279,7 +279,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0e43467edb..41a0332b8d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -847,10 +847,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = new int[] @@ -14238,13 +14234,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14274,13 +14270,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 98cd208eaf..da5318c520 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 4207804752..7f4d5508b2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -267,7 +267,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -279,7 +279,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 61d257b9bd..2cb4f07857 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -856,10 +856,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = new int[] @@ -14255,13 +14251,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14291,13 +14287,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 98cd208eaf..da5318c520 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index f2d4791f95..42d53469b4 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -260,7 +260,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -272,7 +272,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3bf41419bf..8c45339ed2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -852,10 +852,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = new int[] @@ -14215,13 +14211,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14251,13 +14247,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 98cd208eaf..da5318c520 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index f2d4791f95..42d53469b4 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -260,7 +260,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -272,7 +272,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 84b2044b4b..2667ad5445 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -852,10 +852,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = new int[] @@ -14218,13 +14214,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14254,13 +14250,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 98cd208eaf..da5318c520 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index f2d4791f95..42d53469b4 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -260,7 +260,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -272,7 +272,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f1cf1a9c67..c569ea01c6 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -852,10 +852,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = new int[] @@ -14224,13 +14220,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14260,13 +14256,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 98cd208eaf..da5318c520 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 1443cb63e4..aa150ea1fe 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -333,7 +333,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -345,7 +345,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c5baac9b83..8fcdb008bf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -864,10 +864,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = new int[] @@ -14250,13 +14246,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14286,13 +14282,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 7a14a5058b..ba6f11f2c2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 3f5450e694..b4a6fda9d2 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -447,7 +447,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -459,7 +459,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 257a60da65..cf31ff2be6 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -864,10 +864,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = @@ -14320,13 +14316,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14356,13 +14352,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 6fef16284e..8d0ce07b6c 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 3f5450e694..b4a6fda9d2 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -447,7 +447,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -459,7 +459,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c045e3f51b..16a2f3295f 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -877,10 +877,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Shared dualclass skills. private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final int[] DUAL_CLASS_SKILLS = @@ -14357,13 +14353,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14393,13 +14389,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 6fef16284e..8d0ce07b6c 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 975ff2f5c6..58596e32ee 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 @@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8246af8176..49979203a7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -843,10 +843,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -14004,13 +14000,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14040,13 +14036,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 6131d7cd82..b7ccfc5522 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 975ff2f5c6..58596e32ee 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 @@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 51773ffdb8..49d6c15eb4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -843,10 +843,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -14004,13 +14000,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14040,13 +14036,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 6131d7cd82..b7ccfc5522 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 975ff2f5c6..58596e32ee 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 @@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3829fbb2ef..740f02505f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -841,10 +841,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -13989,13 +13985,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14025,13 +14021,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 6131d7cd82..b7ccfc5522 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 975ff2f5c6..58596e32ee 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 @@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c1d55301d7..0790d05c93 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -847,10 +847,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -14035,13 +14031,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14071,13 +14067,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 6131d7cd82..b7ccfc5522 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 975ff2f5c6..58596e32ee 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 @@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 13a13e58f3..882a1e50bc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -847,10 +847,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -14035,13 +14031,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14071,13 +14067,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 6131d7cd82..b7ccfc5522 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 8a3cc4a9e0..f2027ee53c 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 @@ -361,7 +361,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -373,7 +373,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index af7afabedf..cfd3a8e73f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -861,10 +861,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -14035,13 +14031,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14071,13 +14067,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 990fa968e4..4c0e08d0af 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 4207804752..7f4d5508b2 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 @@ -267,7 +267,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -279,7 +279,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4a902a93c1..e4bad72580 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -840,10 +840,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -14000,13 +13996,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14036,13 +14032,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 6131d7cd82..b7ccfc5522 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 7490778f3e..2671a55821 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 @@ -431,7 +431,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -443,7 +443,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d16f8f489e..c6db6f28ab 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -887,10 +887,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -14295,13 +14291,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14331,13 +14327,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 74545b984a..87da3d2b19 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; 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 41bb841997..e1670e00ed 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 @@ -462,7 +462,7 @@ public class DailyTaskManager extends AbstractEventManager> { try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) { - ps.setString(1, "ATTENDANCE_DATE"); + ps.setString(1, PlayerVariables.ATTENDANCE_DATE); ps.execute(); } } @@ -474,7 +474,7 @@ public class DailyTaskManager extends AbstractEventManager> // Update data for online players. for (PlayerInstance player : World.getInstance().getPlayers()) { - player.getVariables().remove("ATTENDANCE_DATE"); + player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE); player.getVariables().storeMe(); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1502f7ffe3..e73e13b9c1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -911,10 +911,6 @@ public class PlayerInstance extends Playable private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; - // Attendance Reward system - private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE"; - private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX"; - // Save responder name for log it private String _lastPetitionGmName = null; @@ -14372,13 +14368,13 @@ public class PlayerInstance extends Playable int rewardIndex; if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } else { - receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); - rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); + receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0); + rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0); } // Check if player can receive reward today. @@ -14408,13 +14404,13 @@ public class PlayerInstance extends Playable nextReward.set(Calendar.HOUR_OF_DAY, 6); if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) { - getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } else { - getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); - getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); + getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis()); + getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 4fc37e6c7e..d32a9baeeb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; + public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; private static final String DAILY_MISSION_REWARDS = "DAILY_MISSION_REWARDS"; public static final String CEREMONY_OF_CHAOS_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";