From 6a5f394ed3d2c070abcb8a34737b933c57e16ee5 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 26 Dec 2022 07:55:02 +0000 Subject: [PATCH] Fixed reseting last Hunt Pass reward. Contributed by Fakee. --- .../java/org/l2jmobius/gameserver/model/HuntPass.java | 6 +++--- .../java/org/l2jmobius/gameserver/model/HuntPass.java | 6 +++--- .../java/org/l2jmobius/gameserver/model/HuntPass.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/HuntPass.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/HuntPass.java index 1d0eb0ef0d..1991368326 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/HuntPass.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/HuntPass.java @@ -218,7 +218,7 @@ public class HuntPass public void setCurrentStep(int step) { - _currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1)); + _currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount())); } public int getRewardStep() @@ -233,7 +233,7 @@ public class HuntPass return; } - _rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1)); + _rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount())); } public boolean isPremium() @@ -253,7 +253,7 @@ public class HuntPass public void setPremiumRewardStep(int step) { - _premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1)); + _premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount())); } public boolean rewardAlert() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/HuntPass.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/HuntPass.java index 70edf397a8..0780d9bc57 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/HuntPass.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/HuntPass.java @@ -218,7 +218,7 @@ public class HuntPass public void setCurrentStep(int step) { - _currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1)); + _currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount())); } public int getRewardStep() @@ -233,7 +233,7 @@ public class HuntPass return; } - _rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1)); + _rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount())); } public boolean isPremium() @@ -253,7 +253,7 @@ public class HuntPass public void setPremiumRewardStep(int step) { - _premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1)); + _premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount())); } public boolean rewardAlert() diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/HuntPass.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/HuntPass.java index b89e81f628..0e9612a1da 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/HuntPass.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/HuntPass.java @@ -218,7 +218,7 @@ public class HuntPass public void setCurrentStep(int step) { - _currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1)); + _currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount())); } public int getRewardStep() @@ -233,7 +233,7 @@ public class HuntPass return; } - _rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1)); + _rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount())); } public boolean isPremium() @@ -253,7 +253,7 @@ public class HuntPass public void setPremiumRewardStep(int step) { - _premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1)); + _premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount())); } public boolean rewardAlert()