Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cast to LevelAccessor instead of instanceof check

Browse Source
This commit is contained in:
Encode42
2022-07-05 13:23:54 -04:00
parent 8e95a61f6d
commit 86dfa7f275
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0283-Config-to-not-let-coral-die.patch
View File

@@ -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 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 --- a/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
+++ b/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 @@ -35,6 +35,7 @@ public class BaseCoralPlantTypeBlock extends Block implements SimpleWaterloggedB
} }
protected static boolean scanForWater(BlockState state, BlockGetter world, BlockPos pos) { 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)) { if (state.getValue(WATERLOGGED)) {
return true; return true;
} else { } 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 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 --- a/src/main/java/net/minecraft/world/level/block/CoralBlock.java
+++ b/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 { @@ -45,6 +45,7 @@ public class CoralBlock extends Block {
} }
protected boolean scanForWater(BlockGetter world, BlockPos pos) { 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(); Direction[] aenumdirection = Direction.values();
int i = aenumdirection.length; int i = aenumdirection.length;