From bfbe7127516d505c5b40f4b0ae57363fc861b91e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 26 Jul 2022 08:52:57 +0000
Subject: [PATCH] Created a method to send pet item infos.

---
 .../clientpackets/pet/ExPetEquipItem.java     | 20 ++++++++++++-------
 .../clientpackets/pet/ExPetUnequipItem.java   | 15 ++++++++++----
 .../clientpackets/pet/ExPetEquipItem.java     | 20 ++++++++++++-------
 .../clientpackets/pet/ExPetUnequipItem.java   | 15 ++++++++++----
 .../clientpackets/pet/ExPetEquipItem.java     | 20 ++++++++++++-------
 .../clientpackets/pet/ExPetUnequipItem.java   | 15 ++++++++++----
 .../clientpackets/pet/ExPetEquipItem.java     | 20 ++++++++++++-------
 .../clientpackets/pet/ExPetUnequipItem.java   | 15 ++++++++++----
 8 files changed, 96 insertions(+), 44 deletions(-)

diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index 1855b63cad..dc344e2be8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -195,8 +195,9 @@ public class ExPetEquipItem implements IClientIncomingPacket
 				// Create and Bind the next action to the AI
 				player.getAI().setNextAction(new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () ->
 				{
-					Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+					final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 					pet.useEquippableItem(transferedItem, false);
+					sendInfos(pet, player);
 				}));
 			}
 			else if (player.isAttackingNow())
@@ -204,19 +205,24 @@ public class ExPetEquipItem implements IClientIncomingPacket
 				// Equip or unEquip.
 				ThreadPool.schedule(() ->
 				{
-					Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+					final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 					pet.useEquippableItem(transferedItem, false);
+					sendInfos(pet, player);
 				}, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()));
 			}
 			else
 			{
-				Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+				final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 				pet.useEquippableItem(transferedItem, false);
+				sendInfos(pet, player);
 			}
-			
-			pet.getStat().recalculateStats(true);
-			player.sendPacket(new PetInfo(pet, 1));
-			player.sendPacket(new ExPetSkillList(false, pet));
 		}
 	}
+	
+	private void sendInfos(Pet pet, Player player)
+	{
+		pet.getStat().recalculateStats(true);
+		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new ExPetSkillList(false, pet));
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index d3e0a44193..c71658e07d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -156,27 +156,34 @@ public class ExPetUnequipItem implements IClientIncomingPacket
 					return;
 				}
 			}
+			
 			if (player.isCastingNow())
 			{
 				// Create and Bind the next action to the AI
 				player.getAI().setNextAction(new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () ->
 				{
 					pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+					sendInfos(pet, player);
 				}));
 			}
 			else if (player.isAttackingNow())
 			{
 				// Equip or unEquip.
 				pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+				sendInfos(pet, player);
 			}
 			else
 			{
 				pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+				sendInfos(pet, player);
 			}
-			
-			pet.getStat().recalculateStats(true);
-			player.sendPacket(new PetInfo(pet, 1));
-			player.sendPacket(new ExPetSkillList(false, pet));
 		}
 	}
+	
+	private void sendInfos(Pet pet, Player player)
+	{
+		pet.getStat().recalculateStats(true);
+		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new ExPetSkillList(false, pet));
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index 1855b63cad..dc344e2be8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -195,8 +195,9 @@ public class ExPetEquipItem implements IClientIncomingPacket
 				// Create and Bind the next action to the AI
 				player.getAI().setNextAction(new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () ->
 				{
-					Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+					final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 					pet.useEquippableItem(transferedItem, false);
+					sendInfos(pet, player);
 				}));
 			}
 			else if (player.isAttackingNow())
@@ -204,19 +205,24 @@ public class ExPetEquipItem implements IClientIncomingPacket
 				// Equip or unEquip.
 				ThreadPool.schedule(() ->
 				{
-					Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+					final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 					pet.useEquippableItem(transferedItem, false);
+					sendInfos(pet, player);
 				}, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()));
 			}
 			else
 			{
-				Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+				final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 				pet.useEquippableItem(transferedItem, false);
+				sendInfos(pet, player);
 			}
-			
-			pet.getStat().recalculateStats(true);
-			player.sendPacket(new PetInfo(pet, 1));
-			player.sendPacket(new ExPetSkillList(false, pet));
 		}
 	}
+	
+	private void sendInfos(Pet pet, Player player)
+	{
+		pet.getStat().recalculateStats(true);
+		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new ExPetSkillList(false, pet));
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index d3e0a44193..c71658e07d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -156,27 +156,34 @@ public class ExPetUnequipItem implements IClientIncomingPacket
 					return;
 				}
 			}
+			
 			if (player.isCastingNow())
 			{
 				// Create and Bind the next action to the AI
 				player.getAI().setNextAction(new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () ->
 				{
 					pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+					sendInfos(pet, player);
 				}));
 			}
 			else if (player.isAttackingNow())
 			{
 				// Equip or unEquip.
 				pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+				sendInfos(pet, player);
 			}
 			else
 			{
 				pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+				sendInfos(pet, player);
 			}
-			
-			pet.getStat().recalculateStats(true);
-			player.sendPacket(new PetInfo(pet, 1));
-			player.sendPacket(new ExPetSkillList(false, pet));
 		}
 	}
+	
+	private void sendInfos(Pet pet, Player player)
+	{
+		pet.getStat().recalculateStats(true);
+		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new ExPetSkillList(false, pet));
+	}
 }
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index 1855b63cad..dc344e2be8 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -195,8 +195,9 @@ public class ExPetEquipItem implements IClientIncomingPacket
 				// Create and Bind the next action to the AI
 				player.getAI().setNextAction(new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () ->
 				{
-					Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+					final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 					pet.useEquippableItem(transferedItem, false);
+					sendInfos(pet, player);
 				}));
 			}
 			else if (player.isAttackingNow())
@@ -204,19 +205,24 @@ public class ExPetEquipItem implements IClientIncomingPacket
 				// Equip or unEquip.
 				ThreadPool.schedule(() ->
 				{
-					Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+					final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 					pet.useEquippableItem(transferedItem, false);
+					sendInfos(pet, player);
 				}, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()));
 			}
 			else
 			{
-				Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+				final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 				pet.useEquippableItem(transferedItem, false);
+				sendInfos(pet, player);
 			}
-			
-			pet.getStat().recalculateStats(true);
-			player.sendPacket(new PetInfo(pet, 1));
-			player.sendPacket(new ExPetSkillList(false, pet));
 		}
 	}
+	
+	private void sendInfos(Pet pet, Player player)
+	{
+		pet.getStat().recalculateStats(true);
+		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new ExPetSkillList(false, pet));
+	}
 }
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index d3e0a44193..c71658e07d 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -156,27 +156,34 @@ public class ExPetUnequipItem implements IClientIncomingPacket
 					return;
 				}
 			}
+			
 			if (player.isCastingNow())
 			{
 				// Create and Bind the next action to the AI
 				player.getAI().setNextAction(new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () ->
 				{
 					pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+					sendInfos(pet, player);
 				}));
 			}
 			else if (player.isAttackingNow())
 			{
 				// Equip or unEquip.
 				pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+				sendInfos(pet, player);
 			}
 			else
 			{
 				pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+				sendInfos(pet, player);
 			}
-			
-			pet.getStat().recalculateStats(true);
-			player.sendPacket(new PetInfo(pet, 1));
-			player.sendPacket(new ExPetSkillList(false, pet));
 		}
 	}
+	
+	private void sendInfos(Pet pet, Player player)
+	{
+		pet.getStat().recalculateStats(true);
+		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new ExPetSkillList(false, pet));
+	}
 }
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index 1855b63cad..dc344e2be8 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -195,8 +195,9 @@ public class ExPetEquipItem implements IClientIncomingPacket
 				// Create and Bind the next action to the AI
 				player.getAI().setNextAction(new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () ->
 				{
-					Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+					final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 					pet.useEquippableItem(transferedItem, false);
+					sendInfos(pet, player);
 				}));
 			}
 			else if (player.isAttackingNow())
@@ -204,19 +205,24 @@ public class ExPetEquipItem implements IClientIncomingPacket
 				// Equip or unEquip.
 				ThreadPool.schedule(() ->
 				{
-					Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+					final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 					pet.useEquippableItem(transferedItem, false);
+					sendInfos(pet, player);
 				}, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()));
 			}
 			else
 			{
-				Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
+				final Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null);
 				pet.useEquippableItem(transferedItem, false);
+				sendInfos(pet, player);
 			}
-			
-			pet.getStat().recalculateStats(true);
-			player.sendPacket(new PetInfo(pet, 1));
-			player.sendPacket(new ExPetSkillList(false, pet));
 		}
 	}
+	
+	private void sendInfos(Pet pet, Player player)
+	{
+		pet.getStat().recalculateStats(true);
+		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new ExPetSkillList(false, pet));
+	}
 }
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index d3e0a44193..c71658e07d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -156,27 +156,34 @@ public class ExPetUnequipItem implements IClientIncomingPacket
 					return;
 				}
 			}
+			
 			if (player.isCastingNow())
 			{
 				// Create and Bind the next action to the AI
 				player.getAI().setNextAction(new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () ->
 				{
 					pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+					sendInfos(pet, player);
 				}));
 			}
 			else if (player.isAttackingNow())
 			{
 				// Equip or unEquip.
 				pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+				sendInfos(pet, player);
 			}
 			else
 			{
 				pet.transferItem("UnequipFromPet", item.getObjectId(), 1, player.getInventory(), player, null);
+				sendInfos(pet, player);
 			}
-			
-			pet.getStat().recalculateStats(true);
-			player.sendPacket(new PetInfo(pet, 1));
-			player.sendPacket(new ExPetSkillList(false, pet));
 		}
 	}
+	
+	private void sendInfos(Pet pet, Player player)
+	{
+		pet.getStat().recalculateStats(true);
+		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new ExPetSkillList(false, pet));
+	}
 }