From f1b1fdfd7db3ef675958e9c01f994116f09ce215 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Sun, 8 Aug 2021 18:17:34 -0400 Subject: [PATCH] [ci-skip] Clean patch --- .../0246-Conduit-behavior-configuration.patch | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/patches/server/0246-Conduit-behavior-configuration.patch b/patches/server/0246-Conduit-behavior-configuration.patch index abfa71e79..00ba4704e 100644 --- a/patches/server/0246-Conduit-behavior-configuration.patch +++ b/patches/server/0246-Conduit-behavior-configuration.patch @@ -5,19 +5,10 @@ Subject: [PATCH] Conduit behavior configuration diff --git a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java -index fc996199616156d04d6ae06ddc3da8d2c159c771..b5b202645c0e9adb2173f8d99381a16f4d409819 100644 +index fc996199616156d04d6ae06ddc3da8d2c159c771..dd76fe8aa67a9c4142295b72b1c3cb7858c2b30b 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java -@@ -55,6 +55,8 @@ public class ConduitBlockEntity extends BlockEntity { - - public ConduitBlockEntity(BlockPos pos, BlockState state) { - super(BlockEntityType.CONDUIT, pos, state); -+ -+ - } - - @Override -@@ -175,7 +177,7 @@ public class ConduitBlockEntity extends BlockEntity { +@@ -175,7 +175,7 @@ public class ConduitBlockEntity extends BlockEntity { if ((l > 1 || i1 > 1 || j1 > 1) && (i == 0 && (i1 == 2 || j1 == 2) || j == 0 && (l == 2 || j1 == 2) || k == 0 && (l == 2 || i1 == 2))) { BlockPos blockposition2 = pos.offset(i, j, k); BlockState iblockdata = world.getBlockState(blockposition2); @@ -26,7 +17,7 @@ index fc996199616156d04d6ae06ddc3da8d2c159c771..b5b202645c0e9adb2173f8d99381a16f int k1 = ablock.length; for (int l1 = 0; l1 < k1; ++l1) { -@@ -195,7 +197,7 @@ public class ConduitBlockEntity extends BlockEntity { +@@ -195,7 +195,7 @@ public class ConduitBlockEntity extends BlockEntity { private static void applyEffects(Level world, BlockPos pos, List activatingBlocks) { int i = activatingBlocks.size(); @@ -35,7 +26,7 @@ index fc996199616156d04d6ae06ddc3da8d2c159c771..b5b202645c0e9adb2173f8d99381a16f int k = pos.getX(); int l = pos.getY(); int i1 = pos.getZ(); -@@ -233,14 +235,14 @@ public class ConduitBlockEntity extends BlockEntity { +@@ -233,14 +233,14 @@ public class ConduitBlockEntity extends BlockEntity { if (!list1.isEmpty()) { blockEntity.destroyTarget = (LivingEntity) list1.get(world.random.nextInt(list1.size())); }