From c8c4604bfd2dd8b4b84b59573f6b722f8c638c57 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sat, 19 Nov 2016 20:28:04 +1100
Subject: [PATCH] SPIGOT-2799: ItemFrame set null error

By: md_5 <git@md-5.net>
---
 .../java/org/bukkit/craftbukkit/entity/CraftItemFrame.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
index d27f24f810..95647efc78 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
@@ -47,13 +47,8 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
         this.entity = frame;
     }
 
-
     public void setItem(org.bukkit.inventory.ItemStack item) {
-        if (item == null || item.getTypeId() == 0) {
-            getHandle().setItem(null);
-        } else {
-            getHandle().setItem(CraftItemStack.asNMSCopy(item));
-        }
+        getHandle().setItem(CraftItemStack.asNMSCopy(item));
     }
 
     public org.bukkit.inventory.ItemStack getItem() {