Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "flip some config defaults for vanilla parity"

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0199-Player-ridable-in-water-option.patch
View File

@@ -21,10 +21,10 @@ index 456460e867626ffe4a895d4d78a6afd6526ef695..b2b51b91459786b2004fdf5bf4ed6b24
if (!this.isPassenger() && this.onGround && !this.isInWater() && !this.isInPowderSnow) {
if (this.getShoulderEntityLeft().isEmpty()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4342edfce61cd6c978fb4c858d91dabd7cc8c094..42a027c803ac040f52835c0a5c4472f73d5d4237 100644
index 0e3360540a33aae9197200e171dae9a745bbb2d5..8c420d6710d3dd97ed488f5a0e00f7c8fbc13b6d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -377,6 +377,7 @@ public class PurpurWorldConfig {
@@ -394,6 +394,7 @@ public class PurpurWorldConfig {
public double playerCriticalDamageMultiplier = 1.5D;
public int playerBurpDelay = 10;
public boolean playerBurpWhenFull = false;
@@ -32,7 +32,7 @@ index 4342edfce61cd6c978fb4c858d91dabd7cc8c094..42a027c803ac040f52835c0a5c4472f7
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -401,6 +402,7 @@ public class PurpurWorldConfig {
@@ -418,6 +419,7 @@ public class PurpurWorldConfig {
playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
playerBurpDelay = getInt("gameplay-mechanics.player.burp-delay", playerBurpDelay);
playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);