From 98d60b45ef292ae563e544cab5f55fa30f82b264 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 8 Oct 2022 14:19:19 +0000
Subject: [PATCH] Fixed probable ExRequestMultiEnchantItemList enchantItem NPE.

---
 .../enchant/multi/ExRequestMultiEnchantItemList.java        | 6 ++++++
 .../enchant/multi/ExRequestMultiEnchantItemList.java        | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
index dca8f13f9e..6bd83be145 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
@@ -131,6 +131,12 @@ public class ExRequestMultiEnchantItemList implements IClientIncomingPacket
 			}
 			
 			final Item enchantItem = player.getInventory().getItemByObjectId(request.getMultiEnchantingItemsBySlot(i));
+			if (enchantItem == null)
+			{
+				player.removeRequest(request.getClass());
+				return;
+			}
+			
 			if (scrollTemplate.getMaxEnchantLevel() < enchantItem.getEnchantLevel())
 			{
 				Logger.getLogger("MultiEnchant - player " + player.getObjectId() + " " + player.getName() + " trying over-enchant item " + enchantItem.getItemName() + " " + enchantItem.getObjectId());
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
index 6787876380..95e567615d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
@@ -131,6 +131,12 @@ public class ExRequestMultiEnchantItemList implements IClientIncomingPacket
 			}
 			
 			final Item enchantItem = player.getInventory().getItemByObjectId(request.getMultiEnchantingItemsBySlot(i));
+			if (enchantItem == null)
+			{
+				player.removeRequest(request.getClass());
+				return;
+			}
+			
 			if (scrollTemplate.getMaxEnchantLevel() < enchantItem.getEnchantLevel())
 			{
 				Logger.getLogger("MultiEnchant - player " + player.getObjectId() + " " + player.getName() + " trying over-enchant item " + enchantItem.getItemName() + " " + enchantItem.getObjectId());