OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-03 13:36:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

ItemStack.asBukkitStack(null) should return Air. Fixes BUKKIT-3170

Browse source
This commit is contained in:
feildmaster 2012-12-15 01:33:14 -06:00
parent 0f4c206f9b
commit d20d4dc43a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
View file

@ -1,10 +1,9 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityItemFrame; import net.minecraft.server.EntityItemFrame;
import net.minecraft.server.ItemStack;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Material;
import org.bukkit.Rotation; import org.bukkit.Rotation;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftItemStack;
@ -26,8 +25,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
} }
public org.bukkit.inventory.ItemStack getItem() { public org.bukkit.inventory.ItemStack getItem() {
ItemStack i = getHandle().i(); return CraftItemStack.asBukkitStack(getHandle().i());
return i == null ? new org.bukkit.inventory.ItemStack(Material.AIR) : CraftItemStack.asBukkitStack(i);
} }
public Rotation getRotation() { public Rotation getRotation() {

3
src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
View file

@ -242,6 +242,9 @@ public class CraftItemStack extends ItemStack {
* Copies the NMS stack to return as a strictly-Bukkit stack * Copies the NMS stack to return as a strictly-Bukkit stack
*/ */
public static ItemStack asBukkitStack(net.minecraft.server.ItemStack original) { 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()); ItemStack stack = new ItemStack(original.id, original.count, (short) original.getData());
stack.addUnsafeEnchantments(getEnchantments(original)); stack.addUnsafeEnchantments(getEnchantments(original));
return stack; return stack;