From 4873495bc27e4a1643fbc59527bb52504bcfb8cb Mon Sep 17 00:00:00 2001 From: granny Date: Sat, 8 Jun 2024 22:32:42 -0700 Subject: [PATCH] add config to reverse bubble column flow for soulsand and magma blocks --- ...Config-to-reverse-bubble-column-flow.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 patches/server/0296-Config-to-reverse-bubble-column-flow.patch diff --git a/patches/server/0296-Config-to-reverse-bubble-column-flow.patch b/patches/server/0296-Config-to-reverse-bubble-column-flow.patch new file mode 100644 index 000000000..4c3265c36 --- /dev/null +++ b/patches/server/0296-Config-to-reverse-bubble-column-flow.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: granny +Date: Sat, 8 Jun 2024 22:06:47 -0700 +Subject: [PATCH] Config to reverse bubble column flow + + +diff --git a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java +index 4c1f20fafdbd86011959cc2d4983b6c2f8e87a5f..0faabddbd68915721994134ba0cb97fe8ab184df 100644 +--- a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java +@@ -122,10 +122,10 @@ public class BubbleColumnBlock extends Block implements BucketPickup { + if (state.is(Blocks.BUBBLE_COLUMN)) { + return state; + } else if (state.is(Blocks.SOUL_SAND)) { +- return Blocks.BUBBLE_COLUMN.defaultBlockState().setValue(DRAG_DOWN, Boolean.valueOf(false)); ++ return Blocks.BUBBLE_COLUMN.defaultBlockState().setValue(DRAG_DOWN, Boolean.valueOf(org.purpurmc.purpur.PurpurConfig.soulSandBlockReverseBubbleColumnFlow)); // Purpur + } else { + return state.is(Blocks.MAGMA_BLOCK) +- ? Blocks.BUBBLE_COLUMN.defaultBlockState().setValue(DRAG_DOWN, Boolean.valueOf(true)) ++ ? Blocks.BUBBLE_COLUMN.defaultBlockState().setValue(DRAG_DOWN, Boolean.valueOf(!org.purpurmc.purpur.PurpurConfig.magmaBlockReverseBubbleColumnFlow)) // Purpur + : Blocks.WATER.defaultBlockState(); + } + } +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +index b5092184076946b7169b67086b9542a9685c15f3..cac4500adee80168823aa4454d6da9a7cb096186 100644 +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +@@ -341,6 +341,8 @@ public class PurpurConfig { + public static int kelpMaxGrowthAge = 25; + public static int twistingVinesMaxGrowthAge = 25; + public static int weepingVinesMaxGrowthAge = 25; ++ public static boolean magmaBlockReverseBubbleColumnFlow = false; ++ public static boolean soulSandBlockReverseBubbleColumnFlow = false; + private static void blockSettings() { + if (version < 3) { + boolean oldValue = getBoolean("settings.barrel.packed-barrels", true); +@@ -412,6 +414,8 @@ public class PurpurConfig { + log(Level.WARNING, "blocks.weeping_vines.max-growth-age is set to above maximum allowed value of 25"); + log(Level.WARNING, "Using value of 25 to prevent issues"); + } ++ magmaBlockReverseBubbleColumnFlow = getBoolean("settings.blocks.magma-block.reverse-bubble-column-flow", magmaBlockReverseBubbleColumnFlow); ++ soulSandBlockReverseBubbleColumnFlow = getBoolean("settings.blocks.soul-sand.reverse-bubble-column-flow", soulSandBlockReverseBubbleColumnFlow); + } + + public static boolean allowInfinityMending = false;