Repackage NMS

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-03-16 09:00:00 +11:00
parent 18496e998f
commit 9da047989c
968 changed files with 5448 additions and 5050 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/FluidTypeFlowing.java
+++ b/net/minecraft/server/FluidTypeFlowing.java
@@ -11,6 +11,15 @@
import java.util.Map;
import java.util.Map.Entry;
--- a/net/minecraft/world/level/material/FluidTypeFlowing.java
+++ b/net/minecraft/world/level/material/FluidTypeFlowing.java
@@ -32,6 +32,15 @@
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraft.world.phys.shapes.VoxelShapes;
+// CraftBukkit start
+import org.bukkit.block.BlockFace;
@@ -16,7 +16,7 @@
public abstract class FluidTypeFlowing extends FluidType {
public static final BlockStateBoolean FALLING = BlockProperties.i;
@@ -110,6 +119,15 @@
@@ -131,6 +140,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);
@@ -140,6 +158,15 @@
@@ -161,6 +179,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);
}
}
@@ -418,12 +445,23 @@
@@ -439,12 +466,23 @@
if (fluid1.isEmpty()) {
fluid = fluid1;

View File

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