From 86dfa7f2755bdae159a5afd66cff853de8b8365f Mon Sep 17 00:00:00 2001 From: Encode42 Date: Tue, 5 Jul 2022 13:23:54 -0400 Subject: [PATCH] Cast to LevelAccessor instead of instanceof check --- patches/server/0283-Config-to-not-let-coral-die.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/0283-Config-to-not-let-coral-die.patch b/patches/server/0283-Config-to-not-let-coral-die.patch index ccf8ea6f4..89f74e62d 100644 --- a/patches/server/0283-Config-to-not-let-coral-die.patch +++ b/patches/server/0283-Config-to-not-let-coral-die.patch @@ -5,26 +5,26 @@ Subject: [PATCH] Config to not let coral die diff --git a/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java b/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java -index 3d2b34c5a7c9b00c1164b4f89c2cbff81fc460eb..96153a255d9cfde1b46c70ff3a5753aca0f74d74 100644 +index 3d2b34c5a7c9b00c1164b4f89c2cbff81fc460eb..b5505e926e5cdb447de68e8eb8e46c97eb988e27 100644 --- a/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java @@ -35,6 +35,7 @@ public class BaseCoralPlantTypeBlock extends Block implements SimpleWaterloggedB } protected static boolean scanForWater(BlockState state, BlockGetter world, BlockPos pos) { -+ if (world instanceof net.minecraft.world.level.Level level && !level.purpurConfig.coralDieOutsideWater) return true; // Purpur ++ if (!((net.minecraft.world.level.LevelAccessor) world).getMinecraftWorld().purpurConfig.coralDieOutsideWater) return true; // Purpur if (state.getValue(WATERLOGGED)) { return true; } else { diff --git a/src/main/java/net/minecraft/world/level/block/CoralBlock.java b/src/main/java/net/minecraft/world/level/block/CoralBlock.java -index 88faea00be60a519f56f975a5311df5e1eb3e6b8..29fd63a36d32f28bfb38158eec7457db1c806cf3 100644 +index 88faea00be60a519f56f975a5311df5e1eb3e6b8..cbb726ac367be81e27d3a86643baf7c4f0746edf 100644 --- a/src/main/java/net/minecraft/world/level/block/CoralBlock.java +++ b/src/main/java/net/minecraft/world/level/block/CoralBlock.java @@ -45,6 +45,7 @@ public class CoralBlock extends Block { } protected boolean scanForWater(BlockGetter world, BlockPos pos) { -+ if (world instanceof net.minecraft.world.level.Level level && !level.purpurConfig.coralDieOutsideWater) return true; // Purpur ++ if (!((net.minecraft.world.level.LevelAccessor) world).getMinecraftWorld().purpurConfig.coralDieOutsideWater) return true; // Purpur Direction[] aenumdirection = Direction.values(); int i = aenumdirection.length;