diff options
author | feildmaster <admin@feildmaster.com> | 2012-12-15 01:33:14 -0600 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2012-12-15 01:52:42 -0600 |
commit | d20d4dc43aaa74fba457c44994cda8180523c9db (patch) | |
tree | c13ad5772a2bc53d634ab882cdd8c34b8b92a855 /src/main/java/org | |
parent | 0f4c206f9b256c441a142b0be68a4a76421c2911 (diff) | |
download | craftbukkit-d20d4dc43aaa74fba457c44994cda8180523c9db.tar craftbukkit-d20d4dc43aaa74fba457c44994cda8180523c9db.tar.gz craftbukkit-d20d4dc43aaa74fba457c44994cda8180523c9db.tar.lz craftbukkit-d20d4dc43aaa74fba457c44994cda8180523c9db.tar.xz craftbukkit-d20d4dc43aaa74fba457c44994cda8180523c9db.zip |
ItemStack.asBukkitStack(null) should return Air. Fixes BUKKIT-3170
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java | 6 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java index e6958b0f..9183e612 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -1,10 +1,9 @@ package org.bukkit.craftbukkit.entity; import net.minecraft.server.EntityItemFrame; -import net.minecraft.server.ItemStack; import org.apache.commons.lang.Validate; -import org.bukkit.Material; + import org.bukkit.Rotation; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.inventory.CraftItemStack; @@ -26,8 +25,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { } public org.bukkit.inventory.ItemStack getItem() { - ItemStack i = getHandle().i(); - return i == null ? new org.bukkit.inventory.ItemStack(Material.AIR) : CraftItemStack.asBukkitStack(i); + return CraftItemStack.asBukkitStack(getHandle().i()); } public Rotation getRotation() { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index 5d5ae069..84b28a98 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -242,6 +242,9 @@ public class CraftItemStack extends ItemStack { * Copies the NMS stack to return as a strictly-Bukkit stack */ public static ItemStack asBukkitStack(net.minecraft.server.ItemStack original) { + if (original == null) { + return new ItemStack(Material.AIR); + } ItemStack stack = new ItemStack(original.id, original.count, (short) original.getData()); stack.addUnsafeEnchantments(getEnchantments(original)); return stack; |