From 85265decd8de15c7c91773774fa16a43905193a4 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 30 Mar 2021 07:52:34 +0000
Subject: [PATCH] Game assistant circlet exchange adjustments. Contributed by
 CostyKiller.

---
 .../others/GameAssistant/GameAssistant.java   | 62 +++++++++++--------
 .../others/GameAssistant/GameAssistant.java   | 62 +++++++++++--------
 2 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index 990cd967b2..d00608b8c7 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -238,40 +238,48 @@ public class GameAssistant extends AbstractNpcAI
 	{
 		String htmltext = null;
 		final int circletId = CIRCLET_EXCHANGE.get(event);
+		final Collection<ItemInstance> circletNum = player.getInventory().getAllItemsByItemId(circletId);
 		final Collection<ItemInstance> enchCircletNum = player.getInventory().getAllItemsByItemId(circletId, 5);
-		switch (enchCircletNum.size())
+		if (circletNum.size() == enchCircletNum.size())
 		{
-			case 0:
-			default:
+			switch (enchCircletNum.size())
 			{
-				htmltext = "32478-21b.html";
-				break;
-			}
-			case 1:
-			{
-				switch (circletId)
+				case 0:
+				default:
 				{
-					case 48202: // Warrior's Circlet
-					case 48205: // Wizard's Circlet
-					case 48208: // Knight's Circlet
-					{
-						takeItems(player, circletId, 1);
-						giveItems(player, NOBLE_UPG_STONE, 1);
-						break;
-					}
-					case 48203: // Noble Warrior's Circlet
-					case 48206: // Noble Wizard's Circlet
-					case 48209: // Noble Knight's Circlet
-					{
-						takeItems(player, circletId, 1);
-						giveItems(player, RADIANT_UPG_STONE, 1);
-						break;
-					}
+					htmltext = "32478-21b.html";
+					break;
+				}
+				case 1:
+				{
+					switch (circletId)
+					{
+						case 48202: // Warrior's Circlet
+						case 48205: // Wizard's Circlet
+						case 48208: // Knight's Circlet
+						{
+							takeItems(player, circletId, 1);
+							giveItems(player, NOBLE_UPG_STONE, 1);
+							break;
+						}
+						case 48203: // Noble Warrior's Circlet
+						case 48206: // Noble Wizard's Circlet
+						case 48209: // Noble Knight's Circlet
+						{
+							takeItems(player, circletId, 1);
+							giveItems(player, RADIANT_UPG_STONE, 1);
+							break;
+						}
+					}
+					htmltext = "32478-21a.html";
+					break;
 				}
-				htmltext = "32478-21a.html";
-				break;
 			}
 		}
+		else
+		{
+			htmltext = "32478-21b.html";
+		}
 		return htmltext;
 	}
 	
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index 990cd967b2..d00608b8c7 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -238,40 +238,48 @@ public class GameAssistant extends AbstractNpcAI
 	{
 		String htmltext = null;
 		final int circletId = CIRCLET_EXCHANGE.get(event);
+		final Collection<ItemInstance> circletNum = player.getInventory().getAllItemsByItemId(circletId);
 		final Collection<ItemInstance> enchCircletNum = player.getInventory().getAllItemsByItemId(circletId, 5);
-		switch (enchCircletNum.size())
+		if (circletNum.size() == enchCircletNum.size())
 		{
-			case 0:
-			default:
+			switch (enchCircletNum.size())
 			{
-				htmltext = "32478-21b.html";
-				break;
-			}
-			case 1:
-			{
-				switch (circletId)
+				case 0:
+				default:
 				{
-					case 48202: // Warrior's Circlet
-					case 48205: // Wizard's Circlet
-					case 48208: // Knight's Circlet
-					{
-						takeItems(player, circletId, 1);
-						giveItems(player, NOBLE_UPG_STONE, 1);
-						break;
-					}
-					case 48203: // Noble Warrior's Circlet
-					case 48206: // Noble Wizard's Circlet
-					case 48209: // Noble Knight's Circlet
-					{
-						takeItems(player, circletId, 1);
-						giveItems(player, RADIANT_UPG_STONE, 1);
-						break;
-					}
+					htmltext = "32478-21b.html";
+					break;
+				}
+				case 1:
+				{
+					switch (circletId)
+					{
+						case 48202: // Warrior's Circlet
+						case 48205: // Wizard's Circlet
+						case 48208: // Knight's Circlet
+						{
+							takeItems(player, circletId, 1);
+							giveItems(player, NOBLE_UPG_STONE, 1);
+							break;
+						}
+						case 48203: // Noble Warrior's Circlet
+						case 48206: // Noble Wizard's Circlet
+						case 48209: // Noble Knight's Circlet
+						{
+							takeItems(player, circletId, 1);
+							giveItems(player, RADIANT_UPG_STONE, 1);
+							break;
+						}
+					}
+					htmltext = "32478-21a.html";
+					break;
 				}
-				htmltext = "32478-21a.html";
-				break;
 			}
 		}
+		else
+		{
+			htmltext = "32478-21b.html";
+		}
 		return htmltext;
 	}