From 8b5f81f77397e668ea06caf2c2a33f079bbb4091 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 14 Nov 2020 22:29:39 +0000
Subject: [PATCH] Non droppable items with visualId.

---
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 .../l2jmobius/gameserver/model/items/instance/ItemInstance.java | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 230f88f50f..d841598768 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -777,7 +777,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index c9c400c538..7b4237a80d 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index c9c400c538..7b4237a80d 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 26189fc629..a1caad874f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 566859a80f..52a5eac6d6 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -785,7 +785,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 566859a80f..52a5eac6d6 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -785,7 +785,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 566859a80f..52a5eac6d6 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -785,7 +785,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 566859a80f..52a5eac6d6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -785,7 +785,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 566859a80f..52a5eac6d6 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -785,7 +785,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 26189fc629..a1caad874f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 26189fc629..a1caad874f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 26189fc629..a1caad874f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 26189fc629..a1caad874f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 26189fc629..a1caad874f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 26189fc629..a1caad874f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 5ca85ce527..0114dee14a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -777,7 +777,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 26189fc629..a1caad874f 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -782,7 +782,7 @@ public class ItemInstance extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && (getVisualId() == 0) && _item.isDropable();
 	}
 	
 	/**