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

Attendance variables moved to PlayerVariables class.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-10-04 13:31:32 +00:00
parent 4e34494d03
commit 0d77fda245
54 changed files with 216 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -267,7 +267,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -279,7 +279,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -845,10 +845,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = new int[] private static final int[] DUAL_CLASS_SKILLS = new int[]
@@ -14189,13 +14185,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14225,13 +14221,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -267,7 +267,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -279,7 +279,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -847,10 +847,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = new int[] private static final int[] DUAL_CLASS_SKILLS = new int[]
@@ -14238,13 +14234,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14274,13 +14270,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -267,7 +267,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -279,7 +279,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -856,10 +856,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = new int[] private static final int[] DUAL_CLASS_SKILLS = new int[]
@@ -14255,13 +14251,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14291,13 +14287,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -260,7 +260,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -272,7 +272,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -852,10 +852,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = new int[] private static final int[] DUAL_CLASS_SKILLS = new int[]
@@ -14215,13 +14211,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14251,13 +14247,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -260,7 +260,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -272,7 +272,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -852,10 +852,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = new int[] private static final int[] DUAL_CLASS_SKILLS = new int[]
@@ -14218,13 +14214,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14254,13 +14250,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -260,7 +260,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -272,7 +272,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -852,10 +852,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = new int[] private static final int[] DUAL_CLASS_SKILLS = new int[]
@@ -14224,13 +14220,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14260,13 +14256,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -333,7 +333,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -345,7 +345,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -864,10 +864,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = new int[] private static final int[] DUAL_CLASS_SKILLS = new int[]
@@ -14250,13 +14246,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14286,13 +14282,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -447,7 +447,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -459,7 +459,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -864,10 +864,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = private static final int[] DUAL_CLASS_SKILLS =
@@ -14320,13 +14316,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14356,13 +14352,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -447,7 +447,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -459,7 +459,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -877,10 +877,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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. // Shared dualclass skills.
private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS"; private static final String KNOWN_DUAL_SKILLS_VAR = "KNOWN_DUAL_SKILLS";
private static final int[] DUAL_CLASS_SKILLS = private static final int[] DUAL_CLASS_SKILLS =
@@ -14357,13 +14353,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14393,13 +14389,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -843,10 +843,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -14004,13 +14000,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14040,13 +14036,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -843,10 +843,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -14004,13 +14000,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14040,13 +14036,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -841,10 +841,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -13989,13 +13985,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14025,13 +14021,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -847,10 +847,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -14035,13 +14031,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14071,13 +14067,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -288,7 +288,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -300,7 +300,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -847,10 +847,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -14035,13 +14031,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14071,13 +14067,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -361,7 +361,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -373,7 +373,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -861,10 +861,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -14035,13 +14031,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14071,13 +14067,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -267,7 +267,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -279,7 +279,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -840,10 +840,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -14000,13 +13996,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14036,13 +14032,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
} }
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -431,7 +431,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -443,7 +443,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -887,10 +887,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -14295,13 +14291,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14331,13 +14327,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+2 -2
View File
@@ -462,7 +462,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{ {
try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, "ATTENDANCE_DATE"); ps.setString(1, PlayerVariables.ATTENDANCE_DATE);
ps.execute(); ps.execute();
} }
} }
@@ -474,7 +474,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
// Update data for online players. // Update data for online players.
for (PlayerInstance player : World.getInstance().getPlayers()) for (PlayerInstance player : World.getInstance().getPlayers())
{ {
player.getVariables().remove("ATTENDANCE_DATE"); player.getVariables().remove(PlayerVariables.ATTENDANCE_DATE);
player.getVariables().storeMe(); player.getVariables().storeMe();
} }
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8 -12
View File
@@ -911,10 +911,6 @@ public class PlayerInstance extends Playable
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP"; private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION"; 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 // Save responder name for log it
private String _lastPetitionGmName = null; private String _lastPetitionGmName = null;
@@ -14372,13 +14368,13 @@ public class PlayerInstance extends Playable
int rewardIndex; int rewardIndex;
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
receiveDate = getAccountVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getAccountVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getAccountVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getAccountVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
else else
{ {
receiveDate = getVariables().getLong(ATTENDANCE_DATE_VAR, 0); receiveDate = getVariables().getLong(PlayerVariables.ATTENDANCE_DATE, 0);
rewardIndex = getVariables().getInt(ATTENDANCE_INDEX_VAR, 0); rewardIndex = getVariables().getInt(PlayerVariables.ATTENDANCE_INDEX, 0);
} }
// Check if player can receive reward today. // Check if player can receive reward today.
@@ -14408,13 +14404,13 @@ public class PlayerInstance extends Playable
nextReward.set(Calendar.HOUR_OF_DAY, 6); nextReward.set(Calendar.HOUR_OF_DAY, 6);
if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT) if (Config.ATTENDANCE_REWARDS_SHARE_ACCOUNT)
{ {
getAccountVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getAccountVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getAccountVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getAccountVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
else else
{ {
getVariables().set(ATTENDANCE_DATE_VAR, nextReward.getTimeInMillis()); getVariables().set(PlayerVariables.ATTENDANCE_DATE, nextReward.getTimeInMillis());
getVariables().set(ATTENDANCE_INDEX_VAR, rewardIndex); getVariables().set(PlayerVariables.ATTENDANCE_INDEX, rewardIndex);
} }
} }
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+2
View File
@@ -49,6 +49,8 @@ public class PlayerVariables extends AbstractVariables
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; 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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_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"; 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_PROHIBITED_PENALTIES = "CEREMONY_OF_CHAOS_PENALTIES";
public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS"; public static final String CEREMONY_OF_CHAOS_MARKS = "CEREMONY_OF_CHAOS_MARKS";