From 6dacfa9b7d2d673bf18e39cab4250d3d8be18b09 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 15 Aug 2021 13:59:06 +0000
Subject: [PATCH] Attack and protection artifacts limited to 3 paperdoll slots.
 Contributed by nasseka.

---
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java   | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 5a6d6ad6b7..167410b235 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2351,7 +2351,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2363,7 +2363,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 5a6d6ad6b7..167410b235 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2351,7 +2351,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2363,7 +2363,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 4fd5e7967c..6de260b820 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2336,7 +2336,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2348,7 +2348,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index b9a5a05719..f732c41324 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2318,7 +2318,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2330,7 +2330,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index b9a5a05719..f732c41324 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2318,7 +2318,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2330,7 +2330,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index b9a5a05719..f732c41324 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2318,7 +2318,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2330,7 +2330,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 6a18e53dda..96d2a4fc2c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2353,7 +2353,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2365,7 +2365,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 6a18e53dda..96d2a4fc2c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2353,7 +2353,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2365,7 +2365,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index d83451d8f4..91ec6d0a32 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2338,7 +2338,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2350,7 +2350,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 4dd28144f3..a8596a10cb 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2446,7 +2446,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2458,7 +2458,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index d660c5ae26..f417c70987 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2476,7 +2476,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2488,7 +2488,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index d660c5ae26..f417c70987 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -2476,7 +2476,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT15) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;
@@ -2488,7 +2488,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
 				{
-					if (_paperdoll[i] == null)
+					if ((i <= PAPERDOLL_ARTIFACT18) && (_paperdoll[i] == null))
 					{
 						setPaperdollItem(i, item);
 						return;