geforkt von Mirrors/Paper
[Bleeding] Return correct drops for Cocoa blocks. Fixes BUKKIT-5159
For Cocoa Blocks, Block.getDropType() returns the item form of the Cocoa block, rather than the Cocoa Bean item. Because of this, Cocoa blocks need to have explicit handling in order to return the proper drop contents. By: t00thpick1 <t00thpick1dirko@gmail.com>
Dieser Commit ist enthalten in:
Ursprung
fcdf051fa5
Commit
d16ad07aa3
@ -6,6 +6,7 @@ import java.util.Collections;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.server.BiomeBase;
|
import net.minecraft.server.BiomeBase;
|
||||||
|
import net.minecraft.server.BlockCocoa;
|
||||||
import net.minecraft.server.BlockRedstoneWire;
|
import net.minecraft.server.BlockRedstoneWire;
|
||||||
import net.minecraft.server.Blocks;
|
import net.minecraft.server.Blocks;
|
||||||
import net.minecraft.server.EnumSkyBlock;
|
import net.minecraft.server.EnumSkyBlock;
|
||||||
@ -428,6 +429,12 @@ public class CraftBlock implements Block {
|
|||||||
}
|
}
|
||||||
|
|
||||||
drops.add(CraftItemStack.asBukkitCopy(nmsStack));
|
drops.add(CraftItemStack.asBukkitCopy(nmsStack));
|
||||||
|
// We don't want to drop cocoa blocks, we want to drop cocoa beans.
|
||||||
|
} else if (Blocks.COCOA == block) {
|
||||||
|
int dropAmount = (BlockCocoa.c(data) >= 2 ? 3 : 1);
|
||||||
|
for (int j = 0; j < dropAmount; ++j) {
|
||||||
|
drops.add(new ItemStack(Material.INK_SACK, 1, (short) 3));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
drops.add(new ItemStack(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(item), 1, (short) block.getDropData(data)));
|
drops.add(new ItemStack(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(item), 1, (short) block.getDropData(data)));
|
||||||
}
|
}
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren