mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
--- a/net/minecraft/server/Block.java
|
|
+++ b/net/minecraft/server/Block.java
|
|
@@ -37,7 +37,7 @@
|
|
private String name;
|
|
|
|
public static int getId(Block block) {
|
|
- return Block.REGISTRY.a((Object) block);
|
|
+ return Block.REGISTRY.a(block); // CraftBukkit - decompile error
|
|
}
|
|
|
|
public static int getCombinedId(IBlockData iblockdata) {
|
|
@@ -334,7 +334,8 @@
|
|
int j = this.getDropCount(i, world.random);
|
|
|
|
for (int k = 0; k < j; ++k) {
|
|
- if (world.random.nextFloat() <= f) {
|
|
+ // CraftBukkit - <= to < to allow for plugins to completely disable block drops from explosions
|
|
+ if (world.random.nextFloat() < f) {
|
|
Item item = this.getDropType(iblockdata, world.random, i);
|
|
|
|
if (item != Items.a) {
|
|
@@ -896,7 +897,7 @@
|
|
|
|
if (hashset.contains(block16)) {
|
|
for (int i = 0; i < 15; ++i) {
|
|
- int j = Block.REGISTRY.a((Object) block16) << 4 | i;
|
|
+ int j = Block.REGISTRY.a(block16) << 4 | i; // CraftBukkit - decompile error
|
|
|
|
Block.REGISTRY_ID.a(block16.fromLegacyData(i), j);
|
|
}
|
|
@@ -905,7 +906,7 @@
|
|
|
|
while (unmodifiableiterator.hasNext()) {
|
|
IBlockData iblockdata = (IBlockData) unmodifiableiterator.next();
|
|
- int k = Block.REGISTRY.a((Object) block16) << 4 | block16.toLegacyData(iblockdata);
|
|
+ int k = Block.REGISTRY.a(block16) << 4 | block16.toLegacyData(iblockdata); // CraftBukkit - decompile error
|
|
|
|
Block.REGISTRY_ID.a(iblockdata, k);
|
|
}
|
|
@@ -914,6 +915,12 @@
|
|
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ public int getExpDrop(World world, IBlockData data, int enchantmentLevel) {
|
|
+ return 0;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
private static void a(int i, MinecraftKey minecraftkey, Block block) {
|
|
Block.REGISTRY.a(i, minecraftkey, block);
|
|
}
|