2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/Block.java
|
|
|
|
+++ b/net/minecraft/server/Block.java
|
2018-08-26 04:00:00 +02:00
|
|
|
@@ -32,7 +32,7 @@
|
|
|
|
@Nullable
|
|
|
|
private String name;
|
|
|
|
private static final ThreadLocal<Object2ByteLinkedOpenHashMap<Block.a>> q = ThreadLocal.withInitial(() -> {
|
|
|
|
- Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap = new Object2ByteLinkedOpenHashMap(200) {
|
|
|
|
+ Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap = new Object2ByteLinkedOpenHashMap<Block.a>(200) { // CraftBukkit - decompile error
|
|
|
|
protected void rehash(int i) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
@@ -194,7 +194,7 @@
|
2016-02-29 22:32:46 +01:00
|
|
|
}
|
|
|
|
|
2018-07-15 02:00:00 +02:00
|
|
|
public Block(Block.Info block_info) {
|
|
|
|
- BlockStateList.a blockstatelist_a = new BlockStateList.a(this);
|
|
|
|
+ BlockStateList.a<Block, IBlockData> blockstatelist_a = new BlockStateList.a(this); // CraftBukkit - decompile error
|
|
|
|
|
|
|
|
this.a(blockstatelist_a);
|
|
|
|
this.blockStateList = blockstatelist_a.a(BlockData::new);
|
2018-12-06 00:00:00 +01:00
|
|
|
@@ -406,7 +406,8 @@
|
2018-07-15 02:00:00 +02:00
|
|
|
int j = this.getDropCount(iblockdata, i, world, blockposition, world.random);
|
2014-11-25 22:32:16 +01:00
|
|
|
|
|
|
|
for (int k = 0; k < j; ++k) {
|
2018-07-15 02:00:00 +02:00
|
|
|
- if (f >= 1.0F || world.random.nextFloat() <= f) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit - <= to < to allow for plugins to completely disable block drops from explosions
|
2018-07-15 02:00:00 +02:00
|
|
|
+ if (f >= 1.0F || world.random.nextFloat() < f) {
|
|
|
|
Item item = this.getDropType(iblockdata, world, blockposition, i).getItem();
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2018-07-15 02:00:00 +02:00
|
|
|
if (item != Items.AIR) {
|
2018-12-06 00:00:00 +01:00
|
|
|
@@ -427,7 +428,13 @@
|
2017-07-28 09:23:39 +02:00
|
|
|
EntityItem entityitem = new EntityItem(world, (double) blockposition.getX() + d0, (double) blockposition.getY() + d1, (double) blockposition.getZ() + d2, itemstack);
|
|
|
|
|
2018-07-15 02:00:00 +02:00
|
|
|
entityitem.n();
|
2017-07-28 09:23:39 +02:00
|
|
|
- world.addEntity(entityitem);
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ if (world.captureDrops != null) {
|
|
|
|
+ world.captureDrops.add(entityitem);
|
|
|
|
+ } else {
|
|
|
|
+ world.addEntity(entityitem);
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-06 00:00:00 +01:00
|
|
|
@@ -1395,8 +1402,14 @@
|
2016-02-29 22:32:46 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
2016-02-29 22:32:46 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start
|
2018-07-15 02:00:00 +02:00
|
|
|
+ public int getExpDrop(IBlockData iblockdata, World world, BlockPosition blockposition, int enchantmentLevel) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2016-02-29 22:32:46 +01:00
|
|
|
+
|
2018-07-15 02:00:00 +02:00
|
|
|
private static void a(MinecraftKey minecraftkey, Block block) {
|
2018-08-26 04:00:00 +02:00
|
|
|
- IRegistry.BLOCK.a(minecraftkey, (Object) block);
|
|
|
|
+ IRegistry.BLOCK.a(minecraftkey, block); // CraftBukkit - decompile error
|
2016-02-29 22:32:46 +01:00
|
|
|
}
|
2018-08-26 04:00:00 +02:00
|
|
|
|
|
|
|
private static void a(String s, Block block) {
|