Revert "flip some config defaults for vanilla parity"

This reverts commit 808b1cbde5.
This commit is contained in:
granny
2023-03-18 18:36:32 -07:00
parent 808b1cbde5
commit 09b5d5446b
136 changed files with 809 additions and 695 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for kinetic damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 851d12caeedbe86f78056cf7b32b4f2ce9e5fc0c..10dbf4f3fb5b5acb87496c0f06da1d29f7a26521 100644
index 501b801fc474009bd6f1b43781804edad8eda921..0da0fe3bba883633422a516bf32452772b32ac41 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2836,6 +2836,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -17,10 +17,10 @@ index 851d12caeedbe86f78056cf7b32b4f2ce9e5fc0c..10dbf4f3fb5b5acb87496c0f06da1d29
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 288b0a82cb0ae42391e91a3a52362d7538240967..9de7c49b4d4eae70cec8e1e7394f54c71d6d3e13 100644
index 4450897735088ca7b126556ebb7ee785241e850b..8725552721e2171a4f00339eb05bd347bab1818f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -167,12 +167,14 @@ public class PurpurWorldConfig {
@@ -184,12 +184,14 @@ public class PurpurWorldConfig {
public boolean elytraIgnoreUnbreaking = false;
public int elytraDamagePerFireworkBoost = 0;
public int elytraDamagePerTridentBoost = 0;