From 36374f7a490cefde6638918bc8401367b2717e31 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 9 Jan 2023 22:38:11 +0000 Subject: [PATCH] Removed RequestHuntPassReward unnecessary methods. --- .../huntpass/RequestHuntPassReward.java | 54 ++++++------------- .../huntpass/RequestHuntPassReward.java | 54 ++++++------------- .../huntpass/RequestHuntPassReward.java | 54 ++++++------------- 3 files changed, 48 insertions(+), 114 deletions(-) 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 091b266670..f86c58f759 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 @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSayhasSup import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo; /** - * @author Serenitty + * @author Serenitty, Mobius */ public class RequestHuntPassReward implements ClientPacket { @@ -81,10 +81,23 @@ public class RequestHuntPassReward implements ClientPacket return; } - normalReward(player); - premiumReward(player); + // Normal reward. + final int premiumRewardIndex = huntPass.getPremiumRewardStep(); + if (!huntPass.isPremium() || ((premiumRewardIndex >= rewardIndex) && (premiumRewardIndex < HuntPassData.getInstance().getPremiumRewardsCount()))) + { + rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex)); + } + + // Premium reward. + if (huntPass.isPremium() && (premiumRewardIndex < HuntPassData.getInstance().getPremiumRewardsCount())) + { + rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex)); + huntPass.setPremiumRewardStep(premiumRewardIndex + 1); + } + huntPass.setRewardStep(rewardIndex + 1); huntPass.setRewardAlert(false); + player.sendPacket(new HuntPassInfo(player, _huntPassType)); player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player)); @@ -92,41 +105,6 @@ public class RequestHuntPassReward implements ClientPacket ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } - private void normalReward(Player player) - { - final HuntPass huntPass = player.getHuntPass(); - final int rewardIndex = huntPass.getRewardStep(); - if (rewardIndex >= HuntPassData.getInstance().getRewardsCount()) - { - return; - } - - if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount()))) - { - return; - } - - rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex)); - } - - private void premiumReward(Player player) - { - final HuntPass huntPass = player.getHuntPass(); - final int rewardIndex = huntPass.getPremiumRewardStep(); - if (rewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount()) - { - return; - } - - if (!huntPass.isPremium()) - { - return; - } - - rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(rewardIndex)); - huntPass.setPremiumRewardStep(rewardIndex + 1); - } - private void rewardItem(Player player, ItemHolder reward) { if (reward.getId() == 60306) // Vitality Sustention Points 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 ee967d3db5..fae058d508 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 @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSayhasSup import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo; /** - * @author Serenitty + * @author Serenitty, Mobius */ public class RequestHuntPassReward implements ClientPacket { @@ -81,10 +81,23 @@ public class RequestHuntPassReward implements ClientPacket return; } - normalReward(player); - premiumReward(player); + // Normal reward. + final int premiumRewardIndex = huntPass.getPremiumRewardStep(); + if (!huntPass.isPremium() || ((premiumRewardIndex >= rewardIndex) && (premiumRewardIndex < HuntPassData.getInstance().getPremiumRewardsCount()))) + { + rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex)); + } + + // Premium reward. + if (huntPass.isPremium() && (premiumRewardIndex < HuntPassData.getInstance().getPremiumRewardsCount())) + { + rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex)); + huntPass.setPremiumRewardStep(premiumRewardIndex + 1); + } + huntPass.setRewardStep(rewardIndex + 1); huntPass.setRewardAlert(false); + player.sendPacket(new HuntPassInfo(player, _huntPassType)); player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player)); @@ -92,41 +105,6 @@ public class RequestHuntPassReward implements ClientPacket ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } - private void normalReward(Player player) - { - final HuntPass huntPass = player.getHuntPass(); - final int rewardIndex = huntPass.getRewardStep(); - if (rewardIndex >= HuntPassData.getInstance().getRewardsCount()) - { - return; - } - - if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount()))) - { - return; - } - - rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex)); - } - - private void premiumReward(Player player) - { - final HuntPass huntPass = player.getHuntPass(); - final int rewardIndex = huntPass.getPremiumRewardStep(); - if (rewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount()) - { - return; - } - - if (!huntPass.isPremium()) - { - return; - } - - rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(rewardIndex)); - huntPass.setPremiumRewardStep(rewardIndex + 1); - } - private void rewardItem(Player player, ItemHolder reward) { if (reward.getId() == 72286) // Sayha's Grace Sustention Points 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 9e9b892b8c..b41c32ca38 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 @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSayhasSup import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo; /** - * @author Serenitty + * @author Serenitty, Mobius */ public class RequestHuntPassReward implements ClientPacket { @@ -81,10 +81,23 @@ public class RequestHuntPassReward implements ClientPacket return; } - normalReward(player); - premiumReward(player); + // Normal reward. + final int premiumRewardIndex = huntPass.getPremiumRewardStep(); + if (!huntPass.isPremium() || ((premiumRewardIndex >= rewardIndex) && (premiumRewardIndex < HuntPassData.getInstance().getPremiumRewardsCount()))) + { + rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex)); + } + + // Premium reward. + if (huntPass.isPremium() && (premiumRewardIndex < HuntPassData.getInstance().getPremiumRewardsCount())) + { + rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex)); + huntPass.setPremiumRewardStep(premiumRewardIndex + 1); + } + huntPass.setRewardStep(rewardIndex + 1); huntPass.setRewardAlert(false); + player.sendPacket(new HuntPassInfo(player, _huntPassType)); player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player)); @@ -92,41 +105,6 @@ public class RequestHuntPassReward implements ClientPacket ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } - private void normalReward(Player player) - { - final HuntPass huntPass = player.getHuntPass(); - final int rewardIndex = huntPass.getRewardStep(); - if (rewardIndex >= HuntPassData.getInstance().getRewardsCount()) - { - return; - } - - if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount()))) - { - return; - } - - rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex)); - } - - private void premiumReward(Player player) - { - final HuntPass huntPass = player.getHuntPass(); - final int rewardIndex = huntPass.getPremiumRewardStep(); - if (rewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount()) - { - return; - } - - if (!huntPass.isPremium()) - { - return; - } - - rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(rewardIndex)); - huntPass.setPremiumRewardStep(rewardIndex + 1); - } - private void rewardItem(Player player, ItemHolder reward) { if (reward.getId() == 72286) // Sayha's Grace Sustention Points