OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 19:52:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Only filter data from block items, not all of them. Fixes BUKKIT-5047

Browse source
This commit is contained in:
Travis Watkins 2013-12-13 18:52:33 -06:00
parent f5fad449bd
commit fbe062caf5
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/net/minecraft/server/ItemStack.java
View file

@ -6,6 +6,8 @@ import java.util.Random;
import net.minecraft.util.com.google.common.collect.HashMultimap; import net.minecraft.util.com.google.common.collect.HashMultimap;
import net.minecraft.util.com.google.common.collect.Multimap; import net.minecraft.util.com.google.common.collect.Multimap;
import org.bukkit.craftbukkit.util.CraftMagicNumbers; // CraftBukkit
public final class ItemStack { public final class ItemStack {
public static final DecimalFormat a = new DecimalFormat("#.###"); public static final DecimalFormat a = new DecimalFormat("#.###");
@ -155,13 +157,12 @@ public final class ItemStack {
return; return;
} }
if (!(this.usesData() || this.getItem().usesDurability())) { // || this.id > 255)) { // Is this a block?
if (CraftMagicNumbers.getBlock(CraftMagicNumbers.getId(this.getItem())) != Blocks.AIR) {
// If vanilla doesn't use data on it don't allow any
if (!(this.usesData() || this.getItem().usesDurability())) {
i = 0; i = 0;
} }
// Filter wool to avoid confusing the client
if (this.getItem() == Item.getItemOf(Blocks.WOOL)) {
i = Math.min(15, i);
} }
// CraftBukkit end // CraftBukkit end