From 9cb5f9bf385662aaa9bf64067d0f06b7327287dd Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:56:42 +0000 Subject: [PATCH] RewardRequest delay adjustments and some additions. --- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../pledgeV2/RequestExPledgeMissionReward.java | 2 +- .../pledgeV2/RequestExPledgeMissionReward.java | 2 +- .../pledgeV2/RequestExPledgeMissionReward.java | 2 +- .../pledgeV2/RequestExPledgeMissionReward.java | 2 +- .../pledgeV2/RequestExPledgeMissionReward.java | 2 +- .../pledgeV2/RequestExPledgeMissionReward.java | 2 +- .../pledgeV2/RequestExPledgeMissionReward.java | 2 +- .../huntpass/RequestHuntPassReward.java | 2 +- .../pledgeV2/RequestExPledgeMissionReward.java | 2 +- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../RequestMissionLevelReceiveReward.java | 15 +++++++++++++++ .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../huntpass/RequestHuntPassReward.java | 2 +- .../RequestMissionLevelReceiveReward.java | 15 +++++++++++++++ .../dailymission/RequestOneDayRewardReceive.java | 3 ++- .../huntpass/RequestHuntPassReward.java | 2 +- 28 files changed, 71 insertions(+), 26 deletions(-) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b9a5566548..d4904c6df1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -64,6 +64,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -77,6 +78,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b9a5566548..d4904c6df1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -64,6 +64,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -77,6 +78,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index f39829d64c..43983f4c70 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionInfo(player)); } - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index f39829d64c..43983f4c70 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionInfo(player)); } - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index f39829d64c..43983f4c70 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionInfo(player)); } - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index f39829d64c..43983f4c70 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionInfo(player)); } - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index f39829d64c..43983f4c70 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionInfo(player)); } - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index f39829d64c..43983f4c70 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionInfo(player)); } - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index f39829d64c..43983f4c70 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionInfo(player)); } - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java index ffb9bdda05..828c23d028 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java @@ -129,7 +129,7 @@ public class RequestHuntPassReward implements ClientPacket player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } private void rewardItem(Player player, ItemHolder reward) diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index f39829d64c..43983f4c70 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionInfo(player)); } - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b9a5566548..d4904c6df1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -64,6 +64,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -77,6 +78,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestMissionLevelReceiveReward.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestMissionLevelReceiveReward.java index f669dd3b30..96fab60fc3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestMissionLevelReceiveReward.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestMissionLevelReceiveReward.java @@ -17,9 +17,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.MissionLevel; import org.l2jmobius.gameserver.model.MissionLevelHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MissionLevelPlayerDataHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -51,6 +53,12 @@ public class RequestMissionLevelReceiveReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final MissionLevelPlayerDataHolder info = player.getMissionLevelProgress(); switch (_rewardType) { @@ -58,6 +66,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket { if (!_holder.getNormalRewards().containsKey(_level) || info.getCollectedNormalRewards().contains(_level) || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level))) { + player.removeRequest(RewardRequest.class); return; } @@ -71,6 +80,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket { if (!_holder.getKeyRewards().containsKey(_level) || info.getCollectedKeyRewards().contains(_level) || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level))) { + player.removeRequest(RewardRequest.class); return; } @@ -84,6 +94,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket { if ((_holder.getSpecialReward() == null) || info.getCollectedSpecialReward() || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level))) { + player.removeRequest(RewardRequest.class); return; } @@ -97,6 +108,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket { if (!_holder.getBonusRewardIsAvailable() || (_holder.getBonusReward() == null) || !info.getCollectedSpecialReward() || info.getCollectedBonusReward() || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level))) { + player.removeRequest(RewardRequest.class); return; } @@ -118,6 +130,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket } else { + player.removeRequest(RewardRequest.class); return; } } @@ -134,5 +147,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket } player.sendPacket(new ExMissionLevelRewardList(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java index ca75757e9c..7d234d09bd 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java @@ -129,7 +129,7 @@ public class RequestHuntPassReward implements ClientPacket player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } private void rewardItem(Player player, ItemHolder reward) diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestMissionLevelReceiveReward.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestMissionLevelReceiveReward.java index f669dd3b30..96fab60fc3 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestMissionLevelReceiveReward.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestMissionLevelReceiveReward.java @@ -17,9 +17,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.MissionLevel; import org.l2jmobius.gameserver.model.MissionLevelHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MissionLevelPlayerDataHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -51,6 +53,12 @@ public class RequestMissionLevelReceiveReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final MissionLevelPlayerDataHolder info = player.getMissionLevelProgress(); switch (_rewardType) { @@ -58,6 +66,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket { if (!_holder.getNormalRewards().containsKey(_level) || info.getCollectedNormalRewards().contains(_level) || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level))) { + player.removeRequest(RewardRequest.class); return; } @@ -71,6 +80,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket { if (!_holder.getKeyRewards().containsKey(_level) || info.getCollectedKeyRewards().contains(_level) || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level))) { + player.removeRequest(RewardRequest.class); return; } @@ -84,6 +94,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket { if ((_holder.getSpecialReward() == null) || info.getCollectedSpecialReward() || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level))) { + player.removeRequest(RewardRequest.class); return; } @@ -97,6 +108,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket { if (!_holder.getBonusRewardIsAvailable() || (_holder.getBonusReward() == null) || !info.getCollectedSpecialReward() || info.getCollectedBonusReward() || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level))) { + player.removeRequest(RewardRequest.class); return; } @@ -118,6 +130,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket } else { + player.removeRequest(RewardRequest.class); return; } } @@ -134,5 +147,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket } player.sendPacket(new ExMissionLevelRewardList(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b90b656179..fa8e953ac0 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { + player.removeRequest(RewardRequest.class); return; } @@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java index e0435f415d..9bc7c4f38f 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java @@ -129,7 +129,7 @@ public class RequestHuntPassReward implements ClientPacket player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player)); - ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); } private void rewardItem(Player player, ItemHolder reward)