From 6ac0196c12b2375cc26f2c6d7ad92c31ed5b2efe Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 26 Aug 2022 23:42:57 +0000 Subject: [PATCH] Proper system message for attendance reward check. Thanks to kamikadzz. --- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- .../clientpackets/attendance/RequestVipAttendanceCheck.java | 6 ++++-- 22 files changed, 88 insertions(+), 44 deletions(-) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..e4cab44b9e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MIN_AFTER_LOGGING_IN_S2_MIN_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..5e65a0fa26 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MIN_AFTER_LOGGING_IN_YOU_HAVE_S2_MIN_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..fc1e43084e 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..fc1e43084e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..fc1e43084e 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..fc1e43084e 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..fc1e43084e 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..fc1e43084e 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..fc1e43084e 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..fc1e43084e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 95a85c269b..07c333b4c4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -65,8 +65,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MINUTES_AFTER_LOGGING_IN_S2_MINUTES_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..4a41856d2e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MIN_AFTER_LOGGING_IN_YOU_HAVE_S2_MIN_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..4a41856d2e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MIN_AFTER_LOGGING_IN_YOU_HAVE_S2_MIN_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 7e89bd6ed3..4a41856d2e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -70,8 +70,10 @@ public class RequestVipAttendanceCheck implements IClientIncomingPacket // Check login delay. if (player.getUptime() < (Config.ATTENDANCE_REWARD_DELAY * 60 * 1000)) { - // player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_LEVEL_REQUIREMENTS_TO_RECEIVE_THE_ATTENDANCE_REWARD_PLEASE_CHECK_THE_REQUIRED_LEVEL_YOU_CAN_REDEEM_YOUR_REWARD_30_MINUTES_AFTER_LOGGING_IN); - player.sendMessage("You can redeem your reward " + Config.ATTENDANCE_REWARD_DELAY + " minutes after logging in."); + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_REDEEM_YOUR_REWARD_S1_MIN_AFTER_LOGGING_IN_YOU_HAVE_S2_MIN_LEFT); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY); + msg.addInt(Config.ATTENDANCE_REWARD_DELAY - Math.toIntExact(player.getUptime() / 1000 / 60)); + player.sendPacket(msg); return; }