From 8ea89f9433e88c3e7010920f8b9a0434a16a30cb Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 24 Nov 2020 17:33:54 -0600 Subject: [PATCH] Fix broken methods in purpur config --- ...twisting-and-weeping-vines-growth-rates.patch | 14 +++++++------- ...and-twisting-vines-configurable-max-len.patch | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/server/0142-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0142-Add-twisting-and-weeping-vines-growth-rates.patch index 25e145abe..4183c8015 100644 --- a/patches/server/0142-Add-twisting-and-weeping-vines-growth-rates.patch +++ b/patches/server/0142-Add-twisting-and-weeping-vines-growth-rates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add twisting and weeping vines growth rates diff --git a/src/main/java/net/minecraft/server/BlockGrowingTop.java b/src/main/java/net/minecraft/server/BlockGrowingTop.java -index 7963411be..6c084ad5c 100644 +index 7963411be9..6c084ad5cd 100644 --- a/src/main/java/net/minecraft/server/BlockGrowingTop.java +++ b/src/main/java/net/minecraft/server/BlockGrowingTop.java @@ -23,9 +23,11 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB @@ -22,7 +22,7 @@ index 7963411be..6c084ad5c 100644 if (this.h(worldserver.getType(blockposition1))) { diff --git a/src/main/java/net/minecraft/server/BlockKelp.java b/src/main/java/net/minecraft/server/BlockKelp.java -index a243aaed5..2a7a6e594 100644 +index a243aaed58..2a7a6e5943 100644 --- a/src/main/java/net/minecraft/server/BlockKelp.java +++ b/src/main/java/net/minecraft/server/BlockKelp.java @@ -53,4 +53,10 @@ public class BlockKelp extends BlockGrowingTop implements IFluidContainer { @@ -37,7 +37,7 @@ index a243aaed5..2a7a6e594 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/BlockTwistingVines.java b/src/main/java/net/minecraft/server/BlockTwistingVines.java -index be3816746..146638111 100644 +index be38167463..146638111c 100644 --- a/src/main/java/net/minecraft/server/BlockTwistingVines.java +++ b/src/main/java/net/minecraft/server/BlockTwistingVines.java @@ -24,4 +24,10 @@ public class BlockTwistingVines extends BlockGrowingTop { @@ -52,7 +52,7 @@ index be3816746..146638111 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/BlockWeepingVines.java b/src/main/java/net/minecraft/server/BlockWeepingVines.java -index 23dca1940..94ffadb91 100644 +index 23dca19403..94ffadb91f 100644 --- a/src/main/java/net/minecraft/server/BlockWeepingVines.java +++ b/src/main/java/net/minecraft/server/BlockWeepingVines.java @@ -24,4 +24,10 @@ public class BlockWeepingVines extends BlockGrowingTop { @@ -67,7 +67,7 @@ index 23dca1940..94ffadb91 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 231db400a..fd175e2ad 100644 +index 231db400ae..44b0a45ec5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -412,6 +412,16 @@ public class PurpurWorldConfig { @@ -75,12 +75,12 @@ index 231db400a..fd175e2ad 100644 } + public double twistingVinesGrowthModifier = 0.10D; -+ public void twistingVinesSettings() { ++ private void twistingVinesSettings() { + twistingVinesGrowthModifier = getDouble("blocks.twisting_vines.growth-modifier", twistingVinesGrowthModifier); + } + + public double weepingVinesGrowthModifier = 0.10D; -+ public void weepingVinesSettings() { ++ private void weepingVinesSettings() { + weepingVinesGrowthModifier = getDouble("blocks.weeping_vines.growth-modifier", weepingVinesGrowthModifier); + } + diff --git a/patches/server/0143-Kelp-weeping-and-twisting-vines-configurable-max-len.patch b/patches/server/0143-Kelp-weeping-and-twisting-vines-configurable-max-len.patch index f1ff43168..1f712d12c 100644 --- a/patches/server/0143-Kelp-weeping-and-twisting-vines-configurable-max-len.patch +++ b/patches/server/0143-Kelp-weeping-and-twisting-vines-configurable-max-len.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Kelp weeping and twisting vines configurable max length diff --git a/src/main/java/net/minecraft/server/BlockGrowingTop.java b/src/main/java/net/minecraft/server/BlockGrowingTop.java -index 6c084ad5c..910dae805 100644 +index 6c084ad5cd..910dae8054 100644 --- a/src/main/java/net/minecraft/server/BlockGrowingTop.java +++ b/src/main/java/net/minecraft/server/BlockGrowingTop.java @@ -15,19 +15,21 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB @@ -50,7 +50,7 @@ index 6c084ad5c..910dae805 100644 } diff --git a/src/main/java/net/minecraft/server/BlockKelp.java b/src/main/java/net/minecraft/server/BlockKelp.java -index 2a7a6e594..92412612a 100644 +index 2a7a6e5943..92412612a5 100644 --- a/src/main/java/net/minecraft/server/BlockKelp.java +++ b/src/main/java/net/minecraft/server/BlockKelp.java @@ -58,5 +58,9 @@ public class BlockKelp extends BlockGrowingTop implements IFluidContainer { @@ -64,7 +64,7 @@ index 2a7a6e594..92412612a 100644 // Purpur end } diff --git a/src/main/java/net/minecraft/server/BlockTwistingVines.java b/src/main/java/net/minecraft/server/BlockTwistingVines.java -index 146638111..a8879e924 100644 +index 146638111c..a8879e924a 100644 --- a/src/main/java/net/minecraft/server/BlockTwistingVines.java +++ b/src/main/java/net/minecraft/server/BlockTwistingVines.java @@ -29,5 +29,9 @@ public class BlockTwistingVines extends BlockGrowingTop { @@ -78,7 +78,7 @@ index 146638111..a8879e924 100644 // Purpur end } diff --git a/src/main/java/net/minecraft/server/BlockWeepingVines.java b/src/main/java/net/minecraft/server/BlockWeepingVines.java -index 94ffadb91..f2168254b 100644 +index 94ffadb91f..f2168254b9 100644 --- a/src/main/java/net/minecraft/server/BlockWeepingVines.java +++ b/src/main/java/net/minecraft/server/BlockWeepingVines.java @@ -29,5 +29,9 @@ public class BlockWeepingVines extends BlockGrowingTop { @@ -92,7 +92,7 @@ index 94ffadb91..f2168254b 100644 // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fd175e2ad..9dd8d694c 100644 +index 44b0a45ec5..e7b7a5b48b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -359,6 +359,11 @@ public class PurpurWorldConfig { @@ -100,7 +100,7 @@ index fd175e2ad..9dd8d694c 100644 } + public int kelpMaxLength = 25; -+ public void kelpSettings() { ++ private void kelpSettings() { + kelpMaxLength = getInt("blocks.kelp.max-length", kelpMaxLength); + } + @@ -112,14 +112,14 @@ index fd175e2ad..9dd8d694c 100644 public double twistingVinesGrowthModifier = 0.10D; + public int twistingVinesMaxLength = 25; - public void twistingVinesSettings() { + private void twistingVinesSettings() { twistingVinesGrowthModifier = getDouble("blocks.twisting_vines.growth-modifier", twistingVinesGrowthModifier); + twistingVinesMaxLength = getInt("blocks.twisting_vines.max-length", twistingVinesMaxLength); } public double weepingVinesGrowthModifier = 0.10D; + public int weepingVinesMaxLength = 25; - public void weepingVinesSettings() { + private void weepingVinesSettings() { weepingVinesGrowthModifier = getDouble("blocks.weeping_vines.growth-modifier", weepingVinesGrowthModifier); + weepingVinesMaxLength = getInt("blocks.weeping_vines.max-length", weepingVinesMaxLength); }