From d8aff79435b71451819b9307ab00c7b507ffc4fe Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 13 Aug 2021 21:43:16 +0000
Subject: [PATCH] Prohibit collection consuming equipped items. Contributed by
 Horus.

---
 .../clientpackets/collection/RequestCollectionRegister.java     | 2 +-
 .../clientpackets/collection/RequestCollectionRegister.java     | 2 +-
 .../clientpackets/collection/RequestCollectionRegister.java     | 2 +-
 .../clientpackets/collection/RequestCollectionRegister.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
index ef85bd1c60..081b4bcb12 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
@@ -78,7 +78,7 @@ public class RequestCollectionRegister implements IClientIncomingPacket
 				break;
 			}
 		}
-		if ((count == 0) || (item.getCount() < count))
+		if ((count == 0) || (item.getCount() < count) || item.isEquipped())
 		{
 			player.sendMessage("Incorrect item count.");
 			return;
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
index ef85bd1c60..081b4bcb12 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
@@ -78,7 +78,7 @@ public class RequestCollectionRegister implements IClientIncomingPacket
 				break;
 			}
 		}
-		if ((count == 0) || (item.getCount() < count))
+		if ((count == 0) || (item.getCount() < count) || item.isEquipped())
 		{
 			player.sendMessage("Incorrect item count.");
 			return;
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
index ef85bd1c60..081b4bcb12 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
@@ -78,7 +78,7 @@ public class RequestCollectionRegister implements IClientIncomingPacket
 				break;
 			}
 		}
-		if ((count == 0) || (item.getCount() < count))
+		if ((count == 0) || (item.getCount() < count) || item.isEquipped())
 		{
 			player.sendMessage("Incorrect item count.");
 			return;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
index ef85bd1c60..081b4bcb12 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java
@@ -78,7 +78,7 @@ public class RequestCollectionRegister implements IClientIncomingPacket
 				break;
 			}
 		}
-		if ((count == 0) || (item.getCount() < count))
+		if ((count == 0) || (item.getCount() < count) || item.isEquipped())
 		{
 			player.sendMessage("Incorrect item count.");
 			return;