Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 22:44:17 +01:00
Code Issues Projects Releases Wiki Activity

Fetch correct info for skulls in block.getDrops(). Fixes BUKKIT-3205

Browse Source
This commit is contained in:
Travis Watkins 2012-12-20 15:06:01 -06:00
parent ed2dd31a80
commit ca7f67da9d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@ -3,10 +3,13 @@ package org.bukkit.craftbukkit.block;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import net.minecraft.server.BiomeBase; import net.minecraft.server.BiomeBase;
import net.minecraft.server.BlockRedstoneWire; import net.minecraft.server.BlockRedstoneWire;
import net.minecraft.server.EnumSkyBlock; import net.minecraft.server.EnumSkyBlock;
import net.minecraft.server.NBTTagCompound;
import net.minecraft.server.TileEntitySkull;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
@ -18,13 +21,12 @@ import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.PistonMoveReaction; import org.bukkit.block.PistonMoveReaction;
import org.bukkit.craftbukkit.CraftChunk; import org.bukkit.craftbukkit.CraftChunk;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.MetadataValue; import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.util.BlockVector; import org.bukkit.util.BlockVector;
import java.util.List;
public class CraftBlock implements Block { public class CraftBlock implements Block {
private final CraftChunk chunk; private final CraftChunk chunk;
private final int x; private final int x;
@ -388,10 +390,23 @@ public class CraftBlock implements Block {
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
int item = block.getDropType(data, chunk.getHandle().world.random, 0); int item = block.getDropType(data, chunk.getHandle().world.random, 0);
if (item > 0) { if (item > 0) {
// Skulls are special, their data is based on the tile entity
if (net.minecraft.server.Block.SKULL.id == this.getTypeId()) {
net.minecraft.server.ItemStack nmsStack = new net.minecraft.server.ItemStack(item, 1, block.getDropData(chunk.getHandle().world, x, y, z));
TileEntitySkull tileentityskull = (TileEntitySkull) chunk.getHandle().world.getTileEntity(x, y, z);
if (tileentityskull.getSkullType() == 3 && tileentityskull.getExtraType() != null && tileentityskull.getExtraType().length() > 0) {
nmsStack.setTag(new NBTTagCompound());
nmsStack.getTag().setString("SkullOwner", tileentityskull.getExtraType());
}
drops.add(CraftItemStack.asBukkitCopy(nmsStack));
} else {
drops.add(new ItemStack(item, 1, (short) block.getDropData(data))); drops.add(new ItemStack(item, 1, (short) block.getDropData(data)));
} }
} }
} }
}
return drops; return drops;
} }