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

Don't blindly cast to level in coral die config

Browse Source
This commit is contained in:
Encode42
2022-07-05 12:42:01 -04:00
parent ff0bea3098
commit 8e95a61f6d
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
index 3d2b34c5a7c9b00c1164b4f89c2cbff81fc460eb..74dc016c3a6f6dbb96aba913117807fbcf955346 100644
index 3d2b34c5a7c9b00c1164b4f89c2cbff81fc460eb..96153a255d9cfde1b46c70ff3a5753aca0f74d74 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 (!((net.minecraft.world.level.Level) world).purpurConfig.coralDieOutsideWater) return true; // Purpur
+ if (world instanceof net.minecraft.world.level.Level level && !level.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..c0284626963711ee42a8d395bcf8a147d14de7a3 100644
index 88faea00be60a519f56f975a5311df5e1eb3e6b8..29fd63a36d32f28bfb38158eec7457db1c806cf3 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 (!((net.minecraft.world.level.Level) world).purpurConfig.coralDieOutsideWater) return true; // Purpur
+ if (world instanceof net.minecraft.world.level.Level level && !level.purpurConfig.coralDieOutsideWater) return true; // Purpur
Direction[] aenumdirection = Direction.values();
int i = aenumdirection.length;