From fe8cabce64b232a49437c2feb9615f6f1833b6cf Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 10 Jan 2023 14:23:27 +0000
Subject: [PATCH] Requests must be removed on return.

---
 .../network/clientpackets/huntpass/RequestHuntPassReward.java | 4 ++--
 .../network/clientpackets/huntpass/RequestHuntPassReward.java | 4 ++--
 .../network/clientpackets/huntpass/RequestHuntPassReward.java | 4 ++--
 3 files changed, 6 insertions(+), 6 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 399477086e..ffb9bdda05 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, Mobius
+ * @author Serenitty, Mobius, Fakee
  */
 public class RequestHuntPassReward implements ClientPacket
 {
@@ -89,6 +89,7 @@ public class RequestHuntPassReward implements ClientPacket
 		}
 		if (reward == null)
 		{
+			player.removeRequest(RewardRequest.class);
 			return;
 		}
 		
@@ -108,7 +109,6 @@ public class RequestHuntPassReward implements ClientPacket
 			rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
 			huntPass.setRewardStep(rewardIndex + 1);
 		}
-		
 		// Premium reward.
 		else if (huntPass.isPremium())
 		{
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 cead479be1..ca75757e9c 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, Mobius
+ * @author Serenitty, Mobius, Fakee
  */
 public class RequestHuntPassReward implements ClientPacket
 {
@@ -89,6 +89,7 @@ public class RequestHuntPassReward implements ClientPacket
 		}
 		if (reward == null)
 		{
+			player.removeRequest(RewardRequest.class);
 			return;
 		}
 		
@@ -108,7 +109,6 @@ public class RequestHuntPassReward implements ClientPacket
 			rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
 			huntPass.setRewardStep(rewardIndex + 1);
 		}
-		
 		// Premium reward.
 		else if (huntPass.isPremium())
 		{
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 984ef8bb3a..e0435f415d 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, Mobius
+ * @author Serenitty, Mobius, Fakee
  */
 public class RequestHuntPassReward implements ClientPacket
 {
@@ -89,6 +89,7 @@ public class RequestHuntPassReward implements ClientPacket
 		}
 		if (reward == null)
 		{
+			player.removeRequest(RewardRequest.class);
 			return;
 		}
 		
@@ -108,7 +109,6 @@ public class RequestHuntPassReward implements ClientPacket
 			rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
 			huntPass.setRewardStep(rewardIndex + 1);
 		}
-		
 		// Premium reward.
 		else if (huntPass.isPremium())
 		{