summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-11-19 20:28:04 +1100
committermd_5 <git@md-5.net>2016-11-19 20:28:04 +1100
commit092243c35d6b7a8743d4b7f3eedc821e46b79e3f (patch)
treead76759a8696b798bb2d7bd2ed486241b8821488 /src/main
parent89e6712cde602999e603e4adec1bb7b9f550f6de (diff)
downloadcraftbukkit-092243c35d6b7a8743d4b7f3eedc821e46b79e3f.tar
craftbukkit-092243c35d6b7a8743d4b7f3eedc821e46b79e3f.tar.gz
craftbukkit-092243c35d6b7a8743d4b7f3eedc821e46b79e3f.tar.lz
craftbukkit-092243c35d6b7a8743d4b7f3eedc821e46b79e3f.tar.xz
craftbukkit-092243c35d6b7a8743d4b7f3eedc821e46b79e3f.zip
SPIGOT-2799: ItemFrame set null error
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
index d27f24f8..95647efc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
+++ b/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() {