From fa7142dee2fc4370bfd550c8a35b522d4b4344f9 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 17 Mar 2019 01:09:32 +0000
Subject: [PATCH] Enable items on pet inventory.

---
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 .../model/items/instance/L2ItemInstance.java  | 31 ++++++++++++-------
 11 files changed, 209 insertions(+), 132 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index 2599fd98d0..8374889696 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1773,22 +1773,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index 9b40177c0f..7a6950f237 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index 9b40177c0f..7a6950f237 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index dc62f94d94..013f0840bf 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1790,22 +1790,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index dc62f94d94..013f0840bf 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1790,22 +1790,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index dc62f94d94..013f0840bf 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1790,22 +1790,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index dc62f94d94..013f0840bf 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1790,22 +1790,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index e509f29f2a..1148113f31 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index e509f29f2a..1148113f31 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index e509f29f2a..1148113f31 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
index e509f29f2a..1148113f31 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
 		{
 			return true;
 		}
-		final L2PcInstance owner = getActingPlayer();
-		for (Condition condition : _item.getConditions())
+		if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
 		{
-			if (condition == null)
+			return true;
+		}
+		L2Character owner = getActingPlayer();
+		if (owner != null)
+		{
+			for (Condition condition : _item.getConditions())
 			{
-				continue;
-			}
-			try
-			{
-				if (!condition.test(owner, owner, null, null))
+				if (condition == null)
+				{
+					continue;
+				}
+				try
+				{
+					if (!condition.test(owner, owner, null, null))
+					{
+						return false;
+					}
+				}
+				catch (Exception e)
 				{
-					return false;
 				}
-			}
-			catch (Exception e)
-			{
 			}
 		}
 		return true;