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

20
paper-server/nms-patches/net/minecraft/world/level/portal/BlockPortalShape.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/portal/BlockPortalShape.java
+++ b/net/minecraft/world/level/portal/BlockPortalShape.java
@@ -19,6 +19,11 @@
@@ -18,6 +18,11 @@
import net.minecraft.world.level.block.state.properties.BlockProperties;
import net.minecraft.world.phys.Vec3D;
@@ -12,7 +12,7 @@
public class BlockPortalShape {
private static final int MIN_WIDTH = 2;
@@ -36,6 +41,7 @@
@@ -35,6 +40,7 @@
private BlockPosition bottomLeft;
private int height;
private final int width;
@@ -20,7 +20,7 @@
public static Optional<BlockPortalShape> findEmptyPortalShape(GeneratorAccess generatoraccess, BlockPosition blockposition, EnumDirection.EnumAxis enumdirection_enumaxis) {
return findPortalShape(generatoraccess, blockposition, (blockportalshape) -> {
@@ -56,6 +62,7 @@
@@ -55,6 +61,7 @@
}
public BlockPortalShape(GeneratorAccess generatoraccess, BlockPosition blockposition, EnumDirection.EnumAxis enumdirection_enumaxis) {
@@ -28,7 +28,7 @@
this.level = generatoraccess;
this.axis = enumdirection_enumaxis;
this.rightDir = enumdirection_enumaxis == EnumDirection.EnumAxis.X ? EnumDirection.WEST : EnumDirection.SOUTH;
@@ -100,6 +107,7 @@
@@ -99,6 +106,7 @@
if (!isEmpty(iblockdata)) {
if (BlockPortalShape.FRAME.test(iblockdata, this.level, blockposition_mutableblockposition)) {
@@ -36,7 +36,7 @@
return i;
}
break;
@@ -110,6 +118,7 @@
@@ -109,6 +117,7 @@
if (!BlockPortalShape.FRAME.test(iblockdata1, this.level, blockposition_mutableblockposition)) {
break;
}
@@ -44,7 +44,7 @@
}
return 0;
@@ -129,6 +138,7 @@
@@ -128,6 +137,7 @@
if (!BlockPortalShape.FRAME.test(this.level.getBlockState(blockposition_mutableblockposition1), this.level, blockposition_mutableblockposition1)) {
return false;
}
@@ -52,7 +52,7 @@
}
return true;
@@ -158,6 +168,10 @@
@@ -157,6 +167,10 @@
++this.numPortalBlocks;
}
}
@@ -63,7 +63,7 @@
}
return 21;
@@ -171,12 +185,28 @@
@@ -170,12 +184,28 @@
return this.bottomLeft != null && this.width >= 2 && this.width <= 21 && this.height >= 3 && this.height <= 21;
}
@@ -93,7 +93,7 @@
}
public boolean isComplete() {
@@ -213,7 +243,7 @@
@@ -212,7 +242,7 @@
return new Vec3D(d2, d3, d4);
}
@@ -102,7 +102,7 @@
BlockPosition blockposition = blockutil_rectangle.minCorner;
IBlockData iblockdata = worldserver.getBlockState(blockposition);
EnumDirection.EnumAxis enumdirection_enumaxis1 = (EnumDirection.EnumAxis) iblockdata.getOptionalValue(BlockProperties.HORIZONTAL_AXIS).orElse(EnumDirection.EnumAxis.X);
@@ -227,6 +257,6 @@
@@ -226,6 +256,6 @@
boolean flag = enumdirection_enumaxis1 == EnumDirection.EnumAxis.X;
Vec3D vec3d3 = new Vec3D((double) blockposition.getX() + (flag ? d2 : d4), (double) blockposition.getY() + d3, (double) blockposition.getZ() + (flag ? d4 : d2));