From 3607913caf81560ff9e809aba8e6fcbfebab4d02 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 26 Jul 2018 08:51:53 +1000
Subject: SPIGOT-4156: Fix deserializing things with damage and meta

---
 src/main/java/org/bukkit/inventory/ItemStack.java | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 41a43053..3c91cbe6 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -488,6 +488,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
             }
         }
 
+        if (version < 0) {
+            // Set damage again incase meta overwrote it
+            if (args.containsKey("damage")) {
+                result.setDurability(damage);
+            }
+        }
+
         return result;
     }
 
-- 
cgit v1.2.3