fix lava sponge patch (#1381)

PurpurMC · Jul 8, 2023 · 96474db · 96474db
1 parent 98b5804
commit 96474db
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/patches/server/0204-Option-for-sponges-to-work-on-lava.patch b/patches/server/0204-Option-for-sponges-to-work-on-lava.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Option for sponges to work on lava
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-index e4e926dc89f843886d0df5da31e00053284f5dae..5964949a6048194476e6dd501503caf0a206715a 100644
+index e4e926dc89f843886d0df5da31e00053284f5dae..a08d72fdf36435be890bb385d28510a1c78c9934 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-@@ -116,7 +116,7 @@ public class SpongeBlock extends Block {
-                 BlockState iblockdata = world.getBlockState(blockposition1);
-                 FluidState fluid = world.getFluidState(blockposition1);
+@@ -67,7 +67,7 @@ public class SpongeBlock extends Block {
+                 FluidState fluid = blockList.getFluidState(blockposition1);
+                 // CraftBukkit end
 
--                if (fluid.is(FluidTags.WATER)) {
-+                if (fluid.is(FluidTags.WATER) || (world.purpurConfig.spongeAbsorbsLava && fluid.is(FluidTags.LAVA))) { // Purpur
-                     if (iblockdata.getBlock() instanceof BucketPickup && !((BucketPickup) iblockdata.getBlock()).pickupBlock(blockList, blockposition1, iblockdata).isEmpty()) {
-                         // NOP
-                     } else if (iblockdata.getBlock() instanceof LiquidBlock) {
+-                if (!fluid.is(FluidTags.WATER)) {
++                if (!fluid.is(FluidTags.WATER) && (world.purpurConfig.spongeAbsorbsLava && !fluid.is(FluidTags.LAVA))) { // Purpur
+                     return false;
+                 } else {
+                     Block block = iblockdata.getBlock();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 index b2451d579db682dbb83dbdfb7854ed6181a1b649..9c88029ebfcc1fd487265ed0b3265f6a5fdab4ba 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java