From f2301bcc610bd09294d1be9ab7ccacceb7a76085 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 18 Mar 2019 20:49:12 +0000
Subject: [PATCH] Ensoul rearrangement after extraction.

---
 .../model/items/instance/L2ItemInstance.java         | 12 ++++++++++++
 .../model/items/instance/L2ItemInstance.java         | 12 ++++++++++++
 .../model/items/instance/L2ItemInstance.java         | 12 ++++++++++++
 .../model/items/instance/L2ItemInstance.java         | 12 ++++++++++++
 .../model/items/instance/L2ItemInstance.java         | 12 ++++++++++++
 .../model/items/instance/L2ItemInstance.java         | 12 ++++++++++++
 .../model/items/instance/L2ItemInstance.java         | 12 ++++++++++++
 .../model/items/instance/L2ItemInstance.java         | 12 ++++++++++++
 8 files changed, 96 insertions(+)

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 013f0840bf..8a804ac5d8 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
@@ -2191,6 +2191,18 @@ public final class L2ItemInstance extends L2Object
 			{
 				removeSpecialAbility(option);
 				_ensoulOptions.remove(position);
+				
+				// Rearrange.
+				if (position == 0)
+				{
+					final EnsoulOption secondEnsoul = _ensoulOptions.get(1);
+					if (secondEnsoul != null)
+					{
+						removeSpecialAbility(secondEnsoul);
+						_ensoulOptions.remove(1);
+						addSpecialAbility(secondEnsoul, 0, 1, true);
+					}
+				}
 			}
 		}
 		else if (type == 2)
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 013f0840bf..8a804ac5d8 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
@@ -2191,6 +2191,18 @@ public final class L2ItemInstance extends L2Object
 			{
 				removeSpecialAbility(option);
 				_ensoulOptions.remove(position);
+				
+				// Rearrange.
+				if (position == 0)
+				{
+					final EnsoulOption secondEnsoul = _ensoulOptions.get(1);
+					if (secondEnsoul != null)
+					{
+						removeSpecialAbility(secondEnsoul);
+						_ensoulOptions.remove(1);
+						addSpecialAbility(secondEnsoul, 0, 1, true);
+					}
+				}
 			}
 		}
 		else if (type == 2)
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 013f0840bf..8a804ac5d8 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
@@ -2191,6 +2191,18 @@ public final class L2ItemInstance extends L2Object
 			{
 				removeSpecialAbility(option);
 				_ensoulOptions.remove(position);
+				
+				// Rearrange.
+				if (position == 0)
+				{
+					final EnsoulOption secondEnsoul = _ensoulOptions.get(1);
+					if (secondEnsoul != null)
+					{
+						removeSpecialAbility(secondEnsoul);
+						_ensoulOptions.remove(1);
+						addSpecialAbility(secondEnsoul, 0, 1, true);
+					}
+				}
 			}
 		}
 		else if (type == 2)
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 013f0840bf..8a804ac5d8 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
@@ -2191,6 +2191,18 @@ public final class L2ItemInstance extends L2Object
 			{
 				removeSpecialAbility(option);
 				_ensoulOptions.remove(position);
+				
+				// Rearrange.
+				if (position == 0)
+				{
+					final EnsoulOption secondEnsoul = _ensoulOptions.get(1);
+					if (secondEnsoul != null)
+					{
+						removeSpecialAbility(secondEnsoul);
+						_ensoulOptions.remove(1);
+						addSpecialAbility(secondEnsoul, 0, 1, true);
+					}
+				}
 			}
 		}
 		else if (type == 2)
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 1148113f31..a22bb67d2b 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
@@ -2189,6 +2189,18 @@ public final class L2ItemInstance extends L2Object
 			{
 				removeSpecialAbility(option);
 				_ensoulOptions.remove(position);
+				
+				// Rearrange.
+				if (position == 0)
+				{
+					final EnsoulOption secondEnsoul = _ensoulOptions.get(1);
+					if (secondEnsoul != null)
+					{
+						removeSpecialAbility(secondEnsoul);
+						_ensoulOptions.remove(1);
+						addSpecialAbility(secondEnsoul, 0, 1, true);
+					}
+				}
 			}
 		}
 		else if (type == 2)
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 1148113f31..a22bb67d2b 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
@@ -2189,6 +2189,18 @@ public final class L2ItemInstance extends L2Object
 			{
 				removeSpecialAbility(option);
 				_ensoulOptions.remove(position);
+				
+				// Rearrange.
+				if (position == 0)
+				{
+					final EnsoulOption secondEnsoul = _ensoulOptions.get(1);
+					if (secondEnsoul != null)
+					{
+						removeSpecialAbility(secondEnsoul);
+						_ensoulOptions.remove(1);
+						addSpecialAbility(secondEnsoul, 0, 1, true);
+					}
+				}
 			}
 		}
 		else if (type == 2)
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 1148113f31..a22bb67d2b 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
@@ -2189,6 +2189,18 @@ public final class L2ItemInstance extends L2Object
 			{
 				removeSpecialAbility(option);
 				_ensoulOptions.remove(position);
+				
+				// Rearrange.
+				if (position == 0)
+				{
+					final EnsoulOption secondEnsoul = _ensoulOptions.get(1);
+					if (secondEnsoul != null)
+					{
+						removeSpecialAbility(secondEnsoul);
+						_ensoulOptions.remove(1);
+						addSpecialAbility(secondEnsoul, 0, 1, true);
+					}
+				}
 			}
 		}
 		else if (type == 2)
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 1148113f31..a22bb67d2b 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
@@ -2189,6 +2189,18 @@ public final class L2ItemInstance extends L2Object
 			{
 				removeSpecialAbility(option);
 				_ensoulOptions.remove(position);
+				
+				// Rearrange.
+				if (position == 0)
+				{
+					final EnsoulOption secondEnsoul = _ensoulOptions.get(1);
+					if (secondEnsoul != null)
+					{
+						removeSpecialAbility(secondEnsoul);
+						_ensoulOptions.remove(1);
+						addSpecialAbility(secondEnsoul, 0, 1, true);
+					}
+				}
 			}
 		}
 		else if (type == 2)