diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/HuntPass.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/HuntPass.java index 71b7a07a52..8eabd6a818 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/HuntPass.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/HuntPass.java @@ -179,10 +179,17 @@ public class HuntPass { final int seasonPasspoint = 1; int calculate = seasonPasspoint + getPoints(); - if ((getPoints() == Config.HUNT_PASS_POINTS_FOR_STEP)) + boolean hasNewLevel = false; + int calculateMe = getPoints(); + while (calculateMe >= Config.HUNT_PASS_POINTS_FOR_STEP) + { + calculateMe = calculateMe - Config.HUNT_PASS_POINTS_FOR_STEP; + setCurrentStep(getCurrentStep() + 1); + hasNewLevel = true; + } + if (hasNewLevel) { calculate %= Config.HUNT_PASS_POINTS_FOR_STEP; - setCurrentStep(getCurrentStep() + 1); setRewardAlert(true); _user.sendPacket(new HuntPassSimpleInfo(_user)); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java index af3c8a145b..1fc9530e88 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java @@ -94,7 +94,11 @@ public class RequestHuntPassReward implements IClientIncomingPacket } huntpass.addSayhaTime(calc); - player.addItem("HuntPassReward", reward, player, true); + if (reward.getId() != 72286) // Sayha's Grace Sustention Points + { + player.addItem("HuntPassReward", reward, player, true); + } + final SystemMessage msg = new SystemMessage(SystemMessageId.SAYHA_S_GRACE_SUSTENTION_POINTS_RECEIVED_S1); msg.addInt((int) (count)); player.sendPacket(msg); 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 2cc03af3ce..8a9f743272 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 @@ -179,10 +179,17 @@ public class HuntPass { final int seasonPasspoint = 1; int calculate = seasonPasspoint + getPoints(); - if ((getPoints() == Config.HUNT_PASS_POINTS_FOR_STEP)) + boolean hasNewLevel = false; + int calculateMe = getPoints(); + while (calculateMe >= Config.HUNT_PASS_POINTS_FOR_STEP) + { + calculateMe = calculateMe - Config.HUNT_PASS_POINTS_FOR_STEP; + setCurrentStep(getCurrentStep() + 1); + hasNewLevel = true; + } + if (hasNewLevel) { calculate %= Config.HUNT_PASS_POINTS_FOR_STEP; - setCurrentStep(getCurrentStep() + 1); setRewardAlert(true); _user.sendPacket(new HuntPassSimpleInfo(_user)); } 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 9541d1eaee..e088a543e5 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 @@ -94,7 +94,11 @@ public class RequestHuntPassReward implements IClientIncomingPacket } huntpass.addSayhaTime(calc); - player.addItem("HuntPassReward", reward, player, true); + if (reward.getId() != 72286) // Sayha's Grace Sustention Points + { + player.addItem("HuntPassReward", reward, player, true); + } + final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_RECEIVED_S1_SAYHA_S_GRACE_SUSTENTION_POINTS); msg.addInt((int) (count)); player.sendPacket(msg);