Update to Minecraft 1.17

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions

View File

@@ -15,8 +15,8 @@
+
public abstract class FluidTypeFlowing extends FluidType {
public static final BlockStateBoolean FALLING = BlockProperties.i;
@@ -131,6 +140,15 @@
public static final BlockStateBoolean FALLING = BlockProperties.FALLING;
@@ -132,6 +141,15 @@
Fluid fluid1 = this.a((IWorldReader) generatoraccess, blockposition1, iblockdata1);
if (this.a(generatoraccess, blockposition, iblockdata, EnumDirection.DOWN, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.getType())) {
@@ -32,7 +32,7 @@
this.a(generatoraccess, blockposition1, iblockdata1, EnumDirection.DOWN, fluid1);
if (this.a((IWorldReader) generatoraccess, blockposition) >= 3) {
this.a(generatoraccess, blockposition, fluid, iblockdata);
@@ -161,6 +179,15 @@
@@ -162,6 +180,15 @@
IBlockData iblockdata1 = generatoraccess.getType(blockposition1);
if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.getType())) {
@@ -48,7 +48,7 @@
this.a(generatoraccess, blockposition1, iblockdata1, enumdirection, fluid1);
}
}
@@ -439,12 +466,23 @@
@@ -440,12 +467,23 @@
if (fluid1.isEmpty()) {
fluid = fluid1;

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/material/FluidTypeLava.java
+++ b/net/minecraft/world/level/material/FluidTypeLava.java
@@ -55,6 +55,13 @@
@@ -85,6 +85,13 @@
if (iblockdata.isAir()) {
if (this.a((IWorldReader) world, blockposition1)) {
@@ -14,7 +14,7 @@
world.setTypeUpdate(blockposition1, BlockFireAbstract.a((IBlockAccess) world, blockposition1));
return;
}
@@ -71,6 +78,14 @@
@@ -101,6 +108,14 @@
}
if (world.isEmpty(blockposition2.up()) && this.b(world, blockposition2)) {
@@ -29,7 +29,7 @@
world.setTypeUpdate(blockposition2.up(), BlockFireAbstract.a((IBlockAccess) world, blockposition2));
}
}
@@ -160,7 +175,11 @@
@@ -196,7 +211,11 @@
if (this.a((Tag) TagsFluid.LAVA) && fluid1.a((Tag) TagsFluid.WATER)) {
if (iblockdata.getBlock() instanceof BlockFluids) {