fix: fix a bug in patch [prevent tripwire dupe in end platform generate]

it fix Leaves#489[https://github.com/LeavesMC/Leaves/issues/489]

luminol-api/paper-patches/features/0001-Rebrand-to-Luminol.patch

@@ -5,15 +5,19 @@ Subject: [PATCH] Rebrand to Luminol
 
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 652ff54e7c50412503725d628bfe72ed03059790..ee163b9fa8f441aa4b3e2309f33e8f932dfc02d7 100644
+index 652ff54e7c50412503725d628bfe72ed03059790..db5e2f10278c20286779362cfdfadb2f42c724e0 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -19,6 +19,13 @@ public interface ServerBuildInfo {
+@@ -19,6 +19,17 @@ public interface ServerBuildInfo {
       */
      Key BRAND_PAPER_ID = Key.key("papermc", "paper");
  
 +    // Luminol start
 +    /**
++     * The brand id for folia
++     */
++    Key BRAND_FOLIA_ID = Key.key("papermc", "folia");
++    /**
 +     * The brand id for Luminol.
 +     */
 +    Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");

luminol-server/minecraft-patches/features/0016-Add-config-for-tripwire-dupe.patch

@@ -18,7 +18,7 @@ index 9aace993c6c18f1a50610e4766225485984b8167..07ffe289b9556b45a9ef7db5357d85b1
                          }
                      }
 diff --git a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
-index f96fc1391167dea48cac1caa464b9026657df89a..c7a46407f4f0915161f26e87241a806bd38145b1 100644
+index f96fc1391167dea48cac1caa464b9026657df89a..016595dd37f74902f926da4c9edf1eabdfe781bc 100644
 --- a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
 +++ b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
 @@ -27,6 +27,9 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
@@ -31,13 +31,14 @@ index f96fc1391167dea48cac1caa464b9026657df89a..c7a46407f4f0915161f26e87241a806b
          for (int i = -2; i <= 2; i++) {
              for (int i1 = -2; i1 <= 2; i1++) {
                  for (int i2 = -1; i2 < 3; i2++) {
-@@ -34,7 +37,23 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
+@@ -34,9 +37,22 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
                      Block block = i2 == -1 ? Blocks.OBSIDIAN : Blocks.AIR;
                      // CraftBukkit start
                      if (!blockList.getBlockState(blockPos).is(block)) {
 -                        if (dropBlocks) {
-+                        boolean flag = false;
-+                        if (dropBlocks && me.earthme.luminol.config.modules.misc.AllowTripwireDupe.preventPlatformBreakString) {
+-                            blockList.destroyBlock(blockPos, true, null);
++                        boolean flag = !dropBlocks;
++                        if (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.preventPlatformBreakString && me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled && dropBlocks) {
 +                            net.minecraft.world.level.block.state.BlockState state = level.getBlockState(blockPos);
 +                            if (state.is(Blocks.TRIPWIRE)) {
 +                                if (state.getValue(net.minecraft.world.level.block.TripWireBlock.DISARMED)) {
@@ -48,15 +49,14 @@ index f96fc1391167dea48cac1caa464b9026657df89a..c7a46407f4f0915161f26e87241a806b
 +                                    flag = checkString(blockList2, blockPos);
 +                                }
 +                            }
-+                        }
-+                        if (flag) {
-+                            blockList1.add(blockPos.immutable());
-+                        } else if (dropBlocks) {
-+                        // Luminol end - prevent tripwire dupe in end platform generate
-                             blockList.destroyBlock(blockPos, true, null);
                          }
++                        if (flag) blockList1.add(blockPos.immutable());
++                        else blockList.destroyBlock(blockPos, true, null);
++                        // Luminol end - prevent tripwire dupe in end platform generate
  
-@@ -56,9 +75,19 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
+                         blockList.setBlock(blockPos, block.defaultBlockState(), 3);
+                         // CraftBukkit end
+@@ -56,9 +72,19 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
  
          // SPIGOT-7856: End platform not dropping items after replacing blocks
          if (dropBlocks) {

luminol-server/paper-patches/features/0001-Rebrand-to-Luminol.patch

@@ -63,7 +63,7 @@ index 29bd788ae8bc61c1e62a4f84b9e259931a7041ce..1676ac5e6c8369836bf719f338603fbb
          } else {
              final Optional<String> gitBranch = build.gitBranch();
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index e741201fdbea0dbbc0e42313ebd33368014c9dc4..673a81734a0903a0790f3007772642d3d9a044cc 100644
+index e741201fdbea0dbbc0e42313ebd33368014c9dc4..e3c5f4c31f084294a59830f3e764921433dd80d5 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 @@ -31,6 +31,7 @@ public record ServerBuildInfoImpl(
@@ -91,7 +91,7 @@ index e741201fdbea0dbbc0e42313ebd33368014c9dc4..673a81734a0903a0790f3007772642d3
      @Override
      public boolean isBrandCompatible(final @NotNull Key brandId) {
 -        return brandId.equals(this.brandId);
-+        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Luminol
++        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_FOLIA_ID); // Luminol
      }
  
      @Override