CarpetFix: explosionBreaksItemFrameInWaterFix

Author: 404Setup

patches/server/0002-Vine-Config.patch

@@ -140,10 +140,10 @@ index 0000000000000000000000000000000000000000..dd96b107b3208707958735ef059c6b20
 \ No newline at end of file
 diff --git a/src/main/kotlin/one/tranic/levelpowered/vine/config/VineConfig.kt b/src/main/kotlin/one/tranic/levelpowered/vine/config/VineConfig.kt
 new file mode 100644
-index 0000000000000000000000000000000000000000..cfbdc493140facfc742bbd99704bd053fcd50500
+index 0000000000000000000000000000000000000000..960b0d79a27c111d2d9750c05e04f8a0f216b7b0
 --- /dev/null
 +++ b/src/main/kotlin/one/tranic/levelpowered/vine/config/VineConfig.kt
-@@ -0,0 +1,210 @@
+@@ -0,0 +1,225 @@
 +package one.tranic.levelpowered.vine.config
 +
 +import gg.pufferfish.pufferfish.simd.SIMDDetection
@@ -212,7 +212,18 @@ index 0000000000000000000000000000000000000000..cfbdc493140facfc742bbd99704bd053
 +        addDefault(
 +            "vine.fix.incorrect-bounce-logic",
 +            false,
-+            listOf("Fixes some entities not bouncing on slime blocks and getting stuck", "Fixes: https://bugs.mojang.com/browse/MC-216985")
++            listOf(
++                "Fixes some entities not bouncing on slime blocks and getting stuck",
++                "Fixes: https://bugs.mojang.com/browse/MC-216985"
++            )
++        )
++        addDefault(
++            "vine.fix.explosion-breaks-item-frame-in-water",
++            false,
++            listOf(
++                "Fixes Explosions being able to destroy item frames in water",
++                "Fixes: https://bugs.mojang.com/browse/MC-3697"
++            )
 +        )
 +
 +        addDefault(
@@ -262,6 +273,7 @@ index 0000000000000000000000000000000000000000..cfbdc493140facfc742bbd99704bd053
 +
 +    private fun loadConfigValue() {
 +        Fix.incorrectBounceLogic = getBoolean("vine.fix.incorrect-bounce-logic")
++        Fix.explosionBreaksItemFrameInWater = getBoolean("vine.fix.explosion-breaks-item-frame-in-water")
 +
 +        LevelBukkit.tryFixAnvilDrop = getBoolean("levelbukkit.try-fix-anvil-drop.enabled")
 +        LevelBukkit.tryFixAnvilDropLogger = getBoolean("levelbukkit.try-fix-anvil-drop.debug")
@@ -318,6 +330,9 @@ index 0000000000000000000000000000000000000000..cfbdc493140facfc742bbd99704bd053
 +    object Fix {
 +        @JvmField
 +        var incorrectBounceLogic = false
++
++        @JvmField
++        var explosionBreaksItemFrameInWater = false
 +    }
 +
 +    object LevelBukkit {

patches/server/0025-Canvas-Optimize-Math.round-and-Math.hypot.patch

@@ -238,7 +238,7 @@ index ac08e7bc5b4e25ad5bba149f358f0c46312b40d9..a45a9fc65ddcdcd51df95b6c26cd8d25
 
              if (entity instanceof AbstractMinecart) {
 diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java
-index 990ea96de8e940390b67e9462fcfd6025f2f5770..c8da0247f76eb9c2c6247833d97ffc9de0538c52 100644
+index 9b5aca3bb44ae0aedb0df38dfecbd7a4e3b7a65a..6994aabad832118c4f8ff0f95a25286cf28a27f1 100644
 --- a/src/main/java/net/minecraft/util/Mth.java
 +++ b/src/main/java/net/minecraft/util/Mth.java
 @@ -29,7 +29,7 @@ public class Mth {
@@ -399,10 +399,10 @@ index a2cb97253c0df83b5fe73eafdfe31fc1996981e6..5219167d81e3fe8cc218f9221419f90f
                          "let exp = " + experienceProgress + "; " +
                          level().purpurConfig.playerDeathExpDropEquation)).floatValue());
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index e4d4ff0ef4a0f3283aa42fe2304816cd6d9475a8..e04f888f1490eb25d054324911e642b617f0c43a 100644
+index bcb15eb7c23d42ae89ec42f35aaa5eff7c6e0dc0..8fe806acf8122008d3a8457445f29fe6a61e7d90 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -316,7 +316,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -346,7 +346,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
      }
 
      protected static float lerpRotation(float prevRot, float newRot) {

patches/server/0033-CarpetFix-explosionBreaksItemFrameInWaterFix.patch

@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: 404Setup <153366651+404Setup@users.noreply.github.com>
+Date: Tue, 30 Jul 2024 20:25:34 +0800
+Subject: [PATCH] CarpetFix: explosionBreaksItemFrameInWaterFix
+
+You can find the original code on https://github.com/fxmorin/carpet-fixes
+
+diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
+index 9af8fcf6abb9b768829592bc1b091ebe4599ed2e..7506f2c33582d1cf49e8a77e86da5d98c550b882 100644
+--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
++++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
+@@ -34,6 +34,7 @@ import net.minecraft.world.level.block.Blocks;
+ import net.minecraft.world.level.block.DiodeBlock;
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.level.gameevent.GameEvent;
++import net.minecraft.world.level.material.Fluids;
+ import net.minecraft.world.level.saveddata.maps.MapId;
+ import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
+ import net.minecraft.world.phys.AABB;
+@@ -170,6 +171,9 @@ public class ItemFrame extends HangingEntity {
+ 
+     @Override
+     public boolean hurt(DamageSource source, float amount) {
++        if (one.tranic.levelpowered.vine.config.VineConfig.Fix.explosionBreaksItemFrameInWater && source.is(DamageTypeTags.IS_EXPLOSION) &&
++                this.level().getFluidState(this.pos).getType().isSame(Fluids.WATER))
++            return true;
+         if (this.fixed) {
+             return !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY) && !source.isCreativePlayer() ? false : super.hurt(source, amount);
+         } else if (this.isInvulnerableTo(source)) {