Make tripwire duping fix configurable

patches/server/0072-Make-sand-duping-fix-configurable.patch

@@ -59,7 +59,7 @@ index 18eaccb39a4c81338a8cbebe3de03934913ac2a4..a1466d29b896c06f67a6f110270377fd
              }
              // Paper end - fix sand duping
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index b3822132cbb34dde90754aa2ee5439433ea4df4b..4f358cc6e6af29addd151ed521d8e1be5655d991 100644
+index b3822132cbb34dde90754aa2ee5439433ea4df4b..636892ac5af6b4c1989c12cf15b75d965f60512a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -274,6 +274,13 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -71,7 +71,7 @@ index b3822132cbb34dde90754aa2ee5439433ea4df4b..4f358cc6e6af29addd151ed521d8e1be
 +        public class Fixes extends ConfigurationPart {
 +
 +            public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
-+            
++
 +        }
  
          public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable

patches/server/0073-Make-tripwire-duping-fix-configurable.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
+Date: Sun, 6 Nov 2022 04:32:27 -0500
+Subject: [PATCH] Make tripwire duping fix configurable
+
+License: MIT (https://opensource.org/licenses/MIT)
+Leaf - https://github.com/Winds-Studio/Leaf
+
+diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
+index cb2ff8d94308c637a498d2737f86f6af4c9c1b83..eb1ecbbb5c0f887ee1c7de85a6137f2f182b3fc0 100644
+--- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
+@@ -78,7 +78,7 @@ public class TripWireBlock extends Block {
+     public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) {
+         if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates) return; // Paper - prevent adjacent tripwires from updating
+         if (!moved && !state.is(newState.getBlock())) {
+-            this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), true); // Paper - fix state inconsistency
++            this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), world.galeConfig().gameplayMechanics.fixes.tripwireDuping); // Paper - fix state inconsistency // Gale - Leaf - make tripwire duping fix configurable
+         }
+     }
+ 
+diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+index 636892ac5af6b4c1989c12cf15b75d965f60512a..18a4ab9f8549fac95d703d9fff4b74e4ae6a9b4f 100644
+--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+@@ -279,6 +279,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+         public class Fixes extends ConfigurationPart {
+ 
+             public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
++            public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
+ 
+         }
+ 

patches/server/0074-Fix-MC-238526.patch

@@ -49,15 +49,13 @@ index cd2ce5bcb8c30e4657cd0e340d80544c7e805905..db3574e4ec9bad32bbbcd9d7ab9607da
      }
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 4f358cc6e6af29addd151ed521d8e1be5655d991..32b9b7ab76fbb2acac9c27c49a27b5dd3134876b 100644
+index 18a4ab9f8549fac95d703d9fff4b74e4ae6a9b4f..1c3624965d9fc1acb406014e3001a0a4920afd2c 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -279,7 +279,12 @@ public class GaleWorldConfiguration extends ConfigurationPart {
-         public class Fixes extends ConfigurationPart {
- 
+@@ -281,6 +281,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
              public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
--            
-+
+             public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
+ 
 +            // Gale start - Purpur - fix MC-238526
 +            @Setting("mc-238526")
 +            public boolean mc238526 = false;

patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch

@@ -64,16 +64,14 @@ index a04374f91f2fbb31219d86b6ae63bcf8fdf7318c..e3b92e8b2274ee6d07d1e9c74f669aea
                      entitycow.setPersistenceRequired();
                  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 32b9b7ab76fbb2acac9c27c49a27b5dd3134876b..f066a6ae227d2d8c064b48529e580c9b84a16ca3 100644
+index 1c3624965d9fc1acb406014e3001a0a4920afd2c..578f393ab5c4088ed1f60d39b908968f3507b651 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -279,7 +279,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
-         public class Fixes extends ConfigurationPart {
+@@ -280,6 +280,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
  
              public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
--
+             public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
 +            public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
-+            
+ 
              // Gale start - Purpur - fix MC-238526
              @Setting("mc-238526")
-             public boolean mc238526 = false;

patches/server/0076-Fix-MC-121706.patch

@@ -65,17 +65,10 @@ index 87fb10096fc9dade33c663234b1cecc34d3d77bb..cb2c6dcdd2be476d0434e7f771bbb251
              }
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index f066a6ae227d2d8c064b48529e580c9b84a16ca3..db4ce11c838dbc718a82abce2376a54259617ae2 100644
+index 578f393ab5c4088ed1f60d39b908968f3507b651..98355899e6307bc9471e2af247e8f3286a86e6dc 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -280,12 +280,17 @@ public class GaleWorldConfiguration extends ConfigurationPart {
- 
-             public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
-             public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
--            
-+
-             // Gale start - Purpur - fix MC-238526
-             @Setting("mc-238526")
+@@ -287,6 +287,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
              public boolean mc238526 = false;
              // Gale end - Purpur - fix MC-238526
  

patches/server/0077-Fix-MC-110386.patch

@@ -35,10 +35,10 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d
      }
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index db4ce11c838dbc718a82abce2376a54259617ae2..a1b69f5815c212312dfef696017ec06d86fd7e36 100644
+index 98355899e6307bc9471e2af247e8f3286a86e6dc..1a5d249268fc09a5117193d0f351676e9a083e16 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -291,6 +291,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -292,6 +292,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
              public boolean mc121706 = false;
              // Gale end - Purpur - fix MC-121706
  

patches/server/0078-Fix-MC-31819.patch

@@ -35,10 +35,10 @@ index 58152160d609d0e9d105153aeb166a56a7955603..6a906b1f37e52472527e9f19e965be9f
          if (!this.abilities.invulnerable) {
              if (!this.level().isClientSide) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index a1b69f5815c212312dfef696017ec06d86fd7e36..60a8ef0c4f3fd95b9d7f6b850b2ae6aacdcc5221 100644
+index 1a5d249268fc09a5117193d0f351676e9a083e16..b6df6cb577536b8ab1fcceeae4b8627adef21e20 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -296,6 +296,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -297,6 +297,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
              public boolean mc110386 = true;
              // Gale end - Mirai - fix MC-110386
  

patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch

@@ -49,12 +49,12 @@ index d9baa85962236c42219cf09d4f3129be93ff069c..414a47a82927bed02a4f3cf330c78e46
  
              blockEntity.teleportCooldown = 100;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 60a8ef0c4f3fd95b9d7f6b850b2ae6aacdcc5221..d3c567390d3e9acb8f69aba16d5eb270f971eaeb 100644
+index b6df6cb577536b8ab1fcceeae4b8627adef21e20..1b5367474c69b2073a643287a29e0beda4a9f08a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -280,6 +280,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
- 
+@@ -281,6 +281,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
              public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
+             public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
              public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
 +            public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal
  

patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch

@@ -55,7 +55,7 @@ index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..cff4d09af11d1741bf3301b457555d71
  
      @Override
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index d3c567390d3e9acb8f69aba16d5eb270f971eaeb..f6ac2c897f63737baecbefdb7cf22302b7a31b68 100644
+index 1b5367474c69b2073a643287a29e0beda4a9f08a..c57275584b56d9d32d4b5f303423ffeb1de19854 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -274,7 +274,9 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0109-Optimize-sheep-offspring-color.patch

@@ -110,7 +110,7 @@ index c0e89262c596fbdd0bb3c3f76baccb17a1bb5fcd..d8f99e1221609d481ee79ee31f645731
          DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
          CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index f6ac2c897f63737baecbefdb7cf22302b7a31b68..3bf1b9a5bb3c974025d4f1f3827fca39141df684 100644
+index c57275584b56d9d32d4b5f303423ffeb1de19854..7be0e4c7a54e858db93a6ac45517533d4b040a8c 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -47,6 +47,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0110-Hide-flames-on-entities-with-fire-resistance.patch

@@ -31,7 +31,7 @@ index 38e24fbc55d36d1e5529e3ff0315b2408cdb99a9..0b22993d2f6bdc6a096626ae76dac243
  
          this.firstTick = false;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 3bf1b9a5bb3c974025d4f1f3827fca39141df684..6e5ca5cd9762fa2ca0b91fb290eac72890693643 100644
+index 7be0e4c7a54e858db93a6ac45517533d4b040a8c..392e0c346ee9f11d21bcc78c5c59f2baab5f391d 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -291,6 +291,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0118-Make-max-interaction-distance-configurable.patch

@@ -86,7 +86,7 @@ index d025232b43af3cb8dc28dff2e3e05c72e490901d..06d75d94af6aff29d542d0c5e150d8f7
  
      public void spawnDustParticles(Level world, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 6e5ca5cd9762fa2ca0b91fb290eac72890693643..db9d461a05fb253ee4f1273e0fb9015c6c46a4bf 100644
+index 392e0c346ee9f11d21bcc78c5c59f2baab5f391d..243a76badb7e09ce4dcf7d5dd8ed57d55768b341 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -271,7 +271,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -119,7 +119,7 @@ index 6e5ca5cd9762fa2ca0b91fb290eac72890693643..db9d461a05fb253ee4f1273e0fb9015c
          public Fixes fixes;
          public class Fixes extends ConfigurationPart {
  
-@@ -324,6 +338,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -325,6 +339,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
  
          public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
  

patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch

@@ -31,10 +31,10 @@ index 0b22993d2f6bdc6a096626ae76dac2433293fa14..ccb2722e8025b97d972cafac5258676c
                      entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values
                      entity.setDeltaMovement(velocity); // Paper - use EntityPortalExitEvent values
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index db9d461a05fb253ee4f1273e0fb9015c6c46a4bf..9213aafac5b3b5718c93c910212f8b77a4b22ea3 100644
+index 243a76badb7e09ce4dcf7d5dd8ed57d55768b341..6f019ba3e732988ce60cbaa0e5494791c78ec21a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -338,6 +338,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -339,6 +339,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
  
          public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
  

patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch

@@ -34,7 +34,7 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..518b40a27a8d4d015caa7e67d3558396
  
                                          if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 9213aafac5b3b5718c93c910212f8b77a4b22ea3..da2e77eed5d75fa0aadc0c12d13f37a0de9d64bc 100644
+index 6f019ba3e732988ce60cbaa0e5494791c78ec21a..e20a48ef23e3eb186f6564102c9146de206282c3 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -268,6 +268,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch

@@ -79,7 +79,7 @@ index 2f252bbe2946ea3228933b4b8c91a4e46fe99705..a35891723fad4fe984566c41cdd72800
              if (iblockdata.is(BlockTags.CLIMBABLE)) {
                  this.lastClimbablePos = Optional.of(blockposition);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index da2e77eed5d75fa0aadc0c12d13f37a0de9d64bc..6a804c026bd4c03462a3031338296a898b5356ef 100644
+index e20a48ef23e3eb186f6564102c9146de206282c3..589ba88b01f23ba9d0b2396e03b0885e88302ab5 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -283,6 +283,18 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch

@@ -38,10 +38,10 @@ index 9c99384dac31b94d62d129868ad6f0131dd7bd16..8e216eaafb1b90d4fd373a4384ecff0b
  
      @Override
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 6a804c026bd4c03462a3031338296a898b5356ef..d80c55aa3d256e1fe7e4dc8dfe26110acd74711a 100644
+index 589ba88b01f23ba9d0b2396e03b0885e88302ab5..faf9ece6dfea15efaae6d7d6501e3a0ae47aed59 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -343,6 +343,22 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -344,6 +344,22 @@ public class GaleWorldConfiguration extends ConfigurationPart {
              public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
              public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal
  

patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch

@@ -36,7 +36,7 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..39035605197bad2eb2fd0c4942c5d43b
              } else {
                  this.wantedX = vec3.x;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index d80c55aa3d256e1fe7e4dc8dfe26110acd74711a..6e848778dc729d7ae5960c3f3098fc20711758a4 100644
+index faf9ece6dfea15efaae6d7d6501e3a0ae47aed59..0c8a2a18da5b86bd5b20d83b3a705651362cf870 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -319,6 +319,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {