Proper RequestItemEnsoul InventoryUpdate logic.

Contributed by nasseka.

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -227,8 +227,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -227,8 +227,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -227,8 +227,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -227,8 +227,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -227,8 +227,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -227,8 +227,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java

@@ -225,8 +225,22 @@ public class RequestItemEnsoul implements IClientIncomingPacket
 				success = 1;
 			}
 			
-			iu.addRemovedItem(soulCrystal);
+			if (soulCrystal.isStackable() && (soulCrystal.getCount() > 0))
-			iu.addModifiedItem(gemStones);
+			{
+				iu.addModifiedItem(soulCrystal);
+			}
+			else
+			{
+				iu.addRemovedItem(soulCrystal);
+			}
+			if (gemStones.isStackable() && (gemStones.getCount() > 0))
+			{
+				iu.addModifiedItem(gemStones);
+			}
+			else
+			{
+				iu.addRemovedItem(gemStones);
+			}
 			iu.addModifiedItem(item);
 		}
 		player.sendInventoryUpdate(iu);