add configurable shovel flattenables

This commit is contained in:
granny
2023-08-13 03:30:27 -07:00
parent 76146eca49
commit 5f858fbe97
261 changed files with 1104 additions and 1097 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 421aaf1fd85da9807bfe1b193bc13c5f3de2f474..3997d78770c503802bd354819d0258c16329858d 100644
index beaabee17209cc3a94dcd3b4272a2f772a83752f..e0d3407c4e2bc94dc656f3a238d2667bb77e2019 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1112,7 +1112,16 @@ public class ServerPlayer extends Player {
@@ -27,10 +27,10 @@ index 421aaf1fd85da9807bfe1b193bc13c5f3de2f474..3997d78770c503802bd354819d0258c1
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 c3681d3afbffbc145bbbda7d341ad70f2b3a5df2..1ad31a516e0c072a62b7422c1fc7efc5a776f5d9 100644
index 002304cc00c5e870f968bcdd569f4b32802166fa..5156bdc06e30bb1ddd5f1d60fdc42cce032d65fc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -113,6 +113,7 @@ public class PurpurWorldConfig {
@@ -114,6 +114,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
@@ -38,7 +38,7 @@ index c3681d3afbffbc145bbbda7d341ad70f2b3a5df2..1ad31a516e0c072a62b7422c1fc7efc5
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -125,6 +126,7 @@ public class PurpurWorldConfig {
@@ -126,6 +127,7 @@ public class PurpurWorldConfig {
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);