Ajustable burp delay (#1153)

This commit is contained in:
5jd
2022-10-15 18:57:23 +02:00
committed by GitHub
parent 9bd5c4437a
commit 3454e6a047
57 changed files with 309 additions and 306 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player ridable in water option
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 281b7534a3f455b57cfe36c6d844f58c2efefd16..45e634589ae1bd83de281bacbe2024531d0351fb 100644
index a53b828a23de5cd008504441d1506b29d03261eb..68dc6a007021f8c97530c1d1c4f92cbb7f573661 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -2095,6 +2095,11 @@ public abstract class Player extends LivingEntity {
@@ -21,10 +21,10 @@ index 281b7534a3f455b57cfe36c6d844f58c2efefd16..45e634589ae1bd83de281bacbe202453
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 cf78a5164628ad14388567a19342ba642fa23dd5..8a0221f1f94f4d39a692d61b990b7bc06a24bf8e 100644
index 3a29ae68b15005fdec1e1e5889e2dec1354b8844..fa6cbac5936296336a53772f9d655b0b6fbbf2f4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -396,6 +396,7 @@ public class PurpurWorldConfig {
@@ -397,6 +397,7 @@ public class PurpurWorldConfig {
public boolean playerBurpWhenFull = false;
public boolean playerArmorSwapping = false;
public boolean playerArmorSwappingCreativeMakesCopy = true;
@@ -32,7 +32,7 @@ index cf78a5164628ad14388567a19342ba642fa23dd5..8a0221f1f94f4d39a692d61b990b7bc0
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -421,6 +422,7 @@ public class PurpurWorldConfig {
@@ -423,6 +424,7 @@ public class PurpurWorldConfig {
playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
playerArmorSwapping = getBoolean("gameplay-mechanics.player.armor-click-equip.allow-hot-swapping", playerArmorSwapping);
playerArmorSwappingCreativeMakesCopy = getBoolean("gameplay-mechanics.player.armor-click-equip.creative-makes-copy", playerArmorSwappingCreativeMakesCopy);