SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.18.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-03-01 02:00:00 +11:00
parent bd40300a4f
commit 9ee989ea81
184 changed files with 1785 additions and 1785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/nms-patches/net/minecraft/world/level/material/FluidTypeFlowing.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/material/FluidTypeFlowing.java
+++ b/net/minecraft/world/level/material/FluidTypeFlowing.java
@@ -31,6 +31,15 @@
@@ -30,6 +30,15 @@
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraft.world.phys.shapes.VoxelShapes;
@@ -16,7 +16,7 @@
public abstract class FluidTypeFlowing extends FluidType {
public static final BlockStateBoolean FALLING = BlockProperties.FALLING;
@@ -131,6 +140,15 @@
@@ -130,6 +139,15 @@
Fluid fluid1 = this.getNewLiquid(generatoraccess, blockposition1, iblockdata1);
if (this.canSpreadTo(generatoraccess, blockposition, iblockdata, EnumDirection.DOWN, blockposition1, iblockdata1, generatoraccess.getFluidState(blockposition1), fluid1.getType())) {
@@ -32,7 +32,7 @@
this.spreadTo(generatoraccess, blockposition1, iblockdata1, EnumDirection.DOWN, fluid1);
if (this.sourceNeighborCount(generatoraccess, blockposition) >= 3) {
this.spreadToSides(generatoraccess, blockposition, fluid, iblockdata);
@@ -161,6 +179,15 @@
@@ -160,6 +178,15 @@
IBlockData iblockdata1 = generatoraccess.getBlockState(blockposition1);
if (this.canSpreadTo(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.getFluidState(blockposition1), fluid1.getType())) {
@@ -48,7 +48,7 @@
this.spreadTo(generatoraccess, blockposition1, iblockdata1, enumdirection, fluid1);
}
}
@@ -439,12 +466,23 @@
@@ -438,12 +465,23 @@
if (fluid1.isEmpty()) {
fluid = fluid1;

8
paper-server/nms-patches/net/minecraft/world/level/material/FluidTypeLava.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/material/FluidTypeLava.java
+++ b/net/minecraft/world/level/material/FluidTypeLava.java
@@ -85,6 +85,13 @@
@@ -84,6 +84,13 @@
if (iblockdata.isAir()) {
if (this.hasFlammableNeighbours(world, blockposition1)) {
@@ -14,7 +14,7 @@
world.setBlockAndUpdate(blockposition1, BlockFireAbstract.getState(world, blockposition1));
return;
}
@@ -101,6 +108,14 @@
@@ -100,6 +107,14 @@
}
if (world.isEmptyBlock(blockposition2.above()) && this.isFlammable(world, blockposition2)) {
@@ -29,9 +29,9 @@
world.setBlockAndUpdate(blockposition2.above(), BlockFireAbstract.getState(world, blockposition2));
}
}
@@ -196,7 +211,11 @@
@@ -195,7 +210,11 @@
if (this.is(TagsFluid.LAVA) && fluid1.is((Tag) TagsFluid.WATER)) {
if (this.is(TagsFluid.LAVA) && fluid1.is(TagsFluid.WATER)) {
if (iblockdata.getBlock() instanceof BlockFluids) {
- generatoraccess.setBlock(blockposition, Blocks.STONE.defaultBlockState(), 3);
+ // CraftBukkit start