From 0a8b3c8742a7446c85fb72c52fff8a91cced9bab Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Fri, 24 Jan 2020 09:35:28 +1100
Subject: [PATCH] SPIGOT-5540: Adding items to inventory causes legacy-data
 loading

By: md_5 <git@md-5.net>
---
 paper-api/src/main/java/org/bukkit/inventory/ItemStack.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java b/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
index 180c292fc9..f70a6a22b8 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -184,11 +184,11 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      * @param data New MaterialData for this item
      */
     public void setData(@Nullable MaterialData data) {
-        Material mat = Bukkit.getUnsafe().toLegacy(getType());
-
-        if (data == null || mat == null || mat.getData() == null) {
+        if (data == null) {
             this.data = data;
         } else {
+            Material mat = Bukkit.getUnsafe().toLegacy(getType());
+
             if ((data.getClass() == mat.getData()) || (data.getClass() == MaterialData.class)) {
                 this.data = data;
             } else {