Fixed augmentation skills were not removed from accessories.

Contributed by Sahar.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -132,9 +132,14 @@ public class RequestRefineCancel extends GameClientPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -144,7 +149,6 @@ public class RequestRefineCancel extends GameClientPacket
 		player.sendPacket(new ExVariationCancelResult(1));
 		
 		// send inventory update
-		final InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendPacket(iu);
 		

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -145,9 +145,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -157,7 +162,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		player.sendPacket(new ExVariationCancelResult(1));
 		
 		// send inventory update
-		final InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendPacket(iu);
 	}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -145,9 +145,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -157,7 +162,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		player.sendPacket(new ExVariationCancelResult(1));
 		
 		// send inventory update
-		final InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendPacket(iu);
 	}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -89,9 +89,14 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		}
 		
 		// unequip item
+		final InventoryUpdate iu = new InventoryUpdate();
 		if (targetItem.isEquipped())
 		{
-			player.disarmWeapons();
+			final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			for (ItemInstance itm : unequiped)
+			{
+				iu.addModifiedItem(itm);
+			}
 		}
 		
 		// remove the augmentation
@@ -101,7 +106,6 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
 		
 		// send inventory update
-		InventoryUpdate iu = new InventoryUpdate();
 		iu.addModifiedItem(targetItem);
 		player.sendInventoryUpdate(iu);
 	}