flip default value for boats doing fall damage

PurpurMC · Mar 26, 2023 · fce57a5 · fce57a5
1 parent 4aba25d
commit fce57a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/patches/server/0112-Add-boat-fall-damage-config.patch b/patches/server/0112-Add-boat-fall-damage-config.patch
@@ -27,14 +27,14 @@ index 8dfc4763df3cd207e7200828f8237f680b47f986..d15b29153d8112ed59ce38ab37142208
 
              if (!flag && isSpawnInvulnerable() && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { // Purpur
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1b19d4cd80166420a9a7918bd96cf39d5616b439..a79b5fcfdee45cca589a13c470b9fc83a750980c 100644
+index 1b19d4cd80166420a9a7918bd96cf39d5616b439..57c460b7fff28dd5e9538e4f96cefee12eb0e2c2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -114,6 +114,7 @@ public class PurpurWorldConfig {
 
      public boolean useBetterMending = false;
      public boolean boatEjectPlayersOnLand = false;
-+    public boolean boatsDoFallDamage = true;
++    public boolean boatsDoFallDamage = false;
      public boolean disableDropsOnCrammingDeath = false;
      public boolean entitiesCanUsePortals = true;
      public boolean milkCuresBadOmen = true;

diff --git a/patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -374,11 +374,11 @@ index 1942649e868fc985a488034c411a6721595ecc67..7495e0e8beedad59fff24ebf189b58b3
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2224f6ef1b011c52597a769a3c0d7ae2dfb11b35..e83b296e24d561080b679193ebe7e32d9ad08688 100644
+index 5553950f84cd14a01aa3b3bee379428128e5aa94..0d091dc0535a65ddc57643bbe0eae57b60df288a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -117,8 +117,11 @@ public class PurpurWorldConfig {
-     public boolean boatsDoFallDamage = true;
+     public boolean boatsDoFallDamage = false;
      public boolean disableDropsOnCrammingDeath = false;
      public boolean entitiesCanUsePortals = true;
 +    public boolean entitiesPickUpLootBypassMobGriefing = false;

diff --git a/patches/server/0133-Config-to-always-tame-in-Creative.patch b/patches/server/0133-Config-to-always-tame-in-Creative.patch
@@ -59,7 +59,7 @@ index 9b2422f9fb0d046ba2246167f9350ed6828f6265..e2109e66a8ab205d7c33adeca5884418
                      this.navigation.stop();
                      this.setTarget((LivingEntity) null);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 31939ae8142fb6b795c4da362cd6ce24045db8f3..4120334507d0811dcfd65f08ee2272aff431b4f3 100644
+index de37cac820761077ed2d39f2bcc7b97110340fa0..aee1a40b47c34a7d0c5d7374d413cf9755729276 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -119,6 +119,7 @@ public class PurpurWorldConfig {
@@ -68,7 +68,7 @@ index 31939ae8142fb6b795c4da362cd6ce24045db8f3..4120334507d0811dcfd65f08ee2272af
      public boolean useBetterMending = false;
 +    public boolean alwaysTameInCreative = false;
      public boolean boatEjectPlayersOnLand = false;
-     public boolean boatsDoFallDamage = true;
+     public boolean boatsDoFallDamage = false;
      public boolean disableDropsOnCrammingDeath = false;
 @@ -137,6 +138,7 @@ public class PurpurWorldConfig {
      public int animalBreedingCooldownSeconds = 0;