From 01c5b655d0be1bfc5af12855d3de4a93a7fbdc7a Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 15 May 2019 15:39:38 +0000
Subject: [PATCH] Alternate position check for ensoul extraction.

---
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 .../clientpackets/ensoul/RequestTryEnSoulExtraction.java | 9 +++++++++
 9 files changed, 81 insertions(+)

diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
index 40850efef3..e34998cbb7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java
@@ -67,6 +67,15 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket
 		if (_type == 1)
 		{
 			option = item.getSpecialAbility(_position);
+			// If position is invalid, check the other one.
+			if ((option == null) && (_position == 0))
+			{
+				option = item.getSpecialAbility(1);
+				if (option != null)
+				{
+					_position = 1;
+				}
+			}
 		}
 		if (_type == 2)
 		{