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

Removed RequestHuntPassReward unnecessary methods.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-09 22:38:11 +00:00
parent 4a2ddb08c5
commit 36374f7a49
3 changed files with 48 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
View File

@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSayhasSup
import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo; import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo;
/** /**
* @author Serenitty * @author Serenitty, Mobius
*/ */
public class RequestHuntPassReward implements ClientPacket public class RequestHuntPassReward implements ClientPacket
{ {
@@ -81,10 +81,23 @@ public class RequestHuntPassReward implements ClientPacket
return; return;
} }
normalReward(player); // Normal reward.
premiumReward(player); 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.setRewardStep(rewardIndex + 1);
huntPass.setRewardAlert(false); huntPass.setRewardAlert(false);
player.sendPacket(new HuntPassInfo(player, _huntPassType)); player.sendPacket(new HuntPassInfo(player, _huntPassType));
player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSayhasSupportInfo(player));
player.sendPacket(new HuntPassSimpleInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player));
@@ -92,41 +105,6 @@ public class RequestHuntPassReward implements ClientPacket
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); 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) private void rewardItem(Player player, ItemHolder reward)
{ {
if (reward.getId() == 60306) // Vitality Sustention Points if (reward.getId() == 60306) // Vitality Sustention Points

54
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
View File

@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSayhasSup
import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo; import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo;
/** /**
* @author Serenitty * @author Serenitty, Mobius
*/ */
public class RequestHuntPassReward implements ClientPacket public class RequestHuntPassReward implements ClientPacket
{ {
@@ -81,10 +81,23 @@ public class RequestHuntPassReward implements ClientPacket
return; return;
} }
normalReward(player); // Normal reward.
premiumReward(player); 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.setRewardStep(rewardIndex + 1);
huntPass.setRewardAlert(false); huntPass.setRewardAlert(false);
player.sendPacket(new HuntPassInfo(player, _huntPassType)); player.sendPacket(new HuntPassInfo(player, _huntPassType));
player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSayhasSupportInfo(player));
player.sendPacket(new HuntPassSimpleInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player));
@@ -92,41 +105,6 @@ public class RequestHuntPassReward implements ClientPacket
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); 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) private void rewardItem(Player player, ItemHolder reward)
{ {
if (reward.getId() == 72286) // Sayha's Grace Sustention Points if (reward.getId() == 72286) // Sayha's Grace Sustention Points

54
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
View File

@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSayhasSup
import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo; import org.l2jmobius.gameserver.network.serverpackets.huntpass.HuntPassSimpleInfo;
/** /**
* @author Serenitty * @author Serenitty, Mobius
*/ */
public class RequestHuntPassReward implements ClientPacket public class RequestHuntPassReward implements ClientPacket
{ {
@@ -81,10 +81,23 @@ public class RequestHuntPassReward implements ClientPacket
return; return;
} }
normalReward(player); // Normal reward.
premiumReward(player); 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.setRewardStep(rewardIndex + 1);
huntPass.setRewardAlert(false); huntPass.setRewardAlert(false);
player.sendPacket(new HuntPassInfo(player, _huntPassType)); player.sendPacket(new HuntPassInfo(player, _huntPassType));
player.sendPacket(new HuntPassSayhasSupportInfo(player)); player.sendPacket(new HuntPassSayhasSupportInfo(player));
player.sendPacket(new HuntPassSimpleInfo(player)); player.sendPacket(new HuntPassSimpleInfo(player));
@@ -92,41 +105,6 @@ public class RequestHuntPassReward implements ClientPacket
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); 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) private void rewardItem(Player player, ItemHolder reward)
{ {
if (reward.getId() == 72286) // Sayha's Grace Sustention Points if (reward.getId() == 72286) // Sayha's Grace Sustention Points