summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockPortal.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockPortal.patch')
-rw-r--r--nms-patches/BlockPortal.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/nms-patches/BlockPortal.patch b/nms-patches/BlockPortal.patch
index 5863e7e6..571debd1 100644
--- a/nms-patches/BlockPortal.patch
+++ b/nms-patches/BlockPortal.patch
@@ -13,7 +13,7 @@
public class BlockPortal extends Block {
public static final BlockStateEnum<EnumDirection.EnumAxis> AXIS = BlockProperties.z;
-@@ -37,7 +43,8 @@
+@@ -36,7 +42,8 @@
}
if (i > 0 && !world.getType(blockposition1.up()).isOccluding()) {
@@ -23,7 +23,7 @@
if (entity != null) {
entity.portalCooldown = entity.aQ();
-@@ -55,8 +62,10 @@
+@@ -54,8 +61,10 @@
BlockPortal.Shape blockportal_shape = this.b(generatoraccess, blockposition);
if (blockportal_shape != null) {
@@ -36,7 +36,7 @@
} else {
return false;
}
-@@ -93,6 +102,10 @@
+@@ -92,6 +101,10 @@
public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {
if (!entity.isPassenger() && !entity.isVehicle() && entity.bm()) {
@@ -47,7 +47,7 @@
entity.e(blockposition);
}
-@@ -193,6 +206,7 @@
+@@ -189,6 +202,7 @@
private BlockPosition position;
private int height;
private int width;
@@ -55,7 +55,7 @@
public Shape(GeneratorAccess generatoraccess, BlockPosition blockposition, EnumDirection.EnumAxis enumdirection_enumaxis) {
this.a = generatoraccess;
-@@ -251,6 +265,9 @@
+@@ -247,6 +261,9 @@
}
protected int c() {
@@ -65,7 +65,7 @@
int i;
label56:
-@@ -273,11 +290,21 @@
+@@ -269,11 +286,21 @@
block = this.a.getType(blockposition.shift(this.d)).getBlock();
if (block != Blocks.OBSIDIAN) {
break label56;
@@ -87,7 +87,7 @@
}
}
}
-@@ -287,6 +314,11 @@
+@@ -283,6 +310,11 @@
if (this.a.getType(this.position.shift(this.c, i).up(this.height)).getBlock() != Blocks.OBSIDIAN) {
this.height = 0;
break;
@@ -99,7 +99,7 @@
}
}
-@@ -310,7 +342,27 @@
+@@ -306,7 +338,27 @@
return this.position != null && this.width >= 2 && this.width <= 21 && this.height >= 3 && this.height <= 21;
}
@@ -128,7 +128,7 @@
for (int i = 0; i < this.width; ++i) {
BlockPosition blockposition = this.position.shift(this.c, i);
-@@ -319,6 +371,7 @@
+@@ -315,6 +367,7 @@
}
}