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

4
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@@ -447,7 +447,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{
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<AbstractEvent<?>>
// 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();
}

20
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
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_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);
}
}

2
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
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 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";