summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-03-08 14:33:40 +1100
committermd_5 <git@md-5.net>2017-03-08 14:35:34 +1100
commit7fce67144dd1b610d4c250939f194b04b0f64a9e (patch)
treeb166df7fe53b347f8f5d6a58f7565241a36ac9ef /src/main/java
parentcb44e932beff9ac7e9ba634cf35e63f41c3670f9 (diff)
downloadcraftbukkit-7fce67144dd1b610d4c250939f194b04b0f64a9e.tar
craftbukkit-7fce67144dd1b610d4c250939f194b04b0f64a9e.tar.gz
craftbukkit-7fce67144dd1b610d4c250939f194b04b0f64a9e.tar.lz
craftbukkit-7fce67144dd1b610d4c250939f194b04b0f64a9e.tar.xz
craftbukkit-7fce67144dd1b610d4c250939f194b04b0f64a9e.zip
SPIGOT-3108: Hack around mirroring empty item stacks
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 6adbbd4a..a54bc7c4 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -71,7 +71,7 @@ public final class CraftItemStack extends ItemStack {
}
public static CraftItemStack asCraftMirror(net.minecraft.server.ItemStack original) {
- return new CraftItemStack(original);
+ return new CraftItemStack((original == null || original.isEmpty()) ? null : original);
}
public static CraftItemStack asCraftCopy(ItemStack original) {