From de9f79661ecbd3a6ca5aa7830bc0a4a7bf72cbc4 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 28 Jun 2020 01:26:36 +0000
Subject: [PATCH] Fixed non dropable items been dropped with karma death.
 Contributed by G-hamsteR.

---
 .../gameserver/model/actor/instance/PlayerInstance.java          | 1 +
 .../gameserver/model/actor/instance/PlayerInstance.java          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 07482a7769..81c885a3c0 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6008,6 +6008,7 @@ public class PlayerInstance extends Playable
 					if (itemDrop.isShadowItem() || // Dont drop Shadow Items
 						(itemDrop.getItemId() == 57) || // Adena
 						(itemDrop.getItem().getType2() == Item.TYPE2_QUEST) || // Quest Items
+						(itemDrop.getItem().isDropable() == false) || // Non-dropable item
 						Config.KARMA_LIST_NONDROPPABLE_ITEMS.contains(itemDrop.getItemId()) || // Item listed in the non droppable item list
 						Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS.contains(itemDrop.getItemId()) || // Item listed in the non droppable pet item list
 						((getPet() != null) && (getPet().getControlItemId() == itemDrop.getItemId() // Control Item of active pet
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0f403f4a3e..8426e57e0c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -6115,6 +6115,7 @@ public class PlayerInstance extends Playable
 						itemDrop.isShadowItem() || // Dont drop Shadow Items
 						(itemDrop.getItemId() == 57) || // Adena
 						(itemDrop.getItem().getType2() == Item.TYPE2_QUEST) || // Quest Items
+						(itemDrop.getItem().isDropable() == false) || // Non-dropable item
 						Config.KARMA_LIST_NONDROPPABLE_ITEMS.contains(itemDrop.getItemId()) || // Item listed in the non droppable item list
 						Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS.contains(itemDrop.getItemId()) || // Item listed in the non droppable pet item list
 						((getPet() != null) && (getPet().getControlItemId() == itemDrop.getItemId() // Control Item of active pet