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

[ci-skip] Reorder configs

Browse Source
This commit is contained in:
BillyGalbreath
2021-12-31 09:45:42 -06:00
parent 2e4174e033
commit 1c9c6b910a
180 changed files with 906 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,10 +21,10 @@ index f254cd917eb9198e902b68f78127f9fc63fde7c7..d0e66f4e5afec947bf6331a7883dc840
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 5f53e643f531c566eb05b76cc3a891c2b6bcced5..375eb761e8fb27de5e45d146fea0013c8fd7cd4e 100644
index ba56f6d9ab1029ee6261968b732ee5cddf45f242..6370b3638c518b6dd9b1e6690d31da580f52d3d9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -360,6 +360,7 @@ public class PurpurWorldConfig {
@@ -386,6 +386,7 @@ public class PurpurWorldConfig {
public boolean playerBurpWhenFull = false;
public boolean playerArmorSwapping = false;
public boolean playerArmorSwappingCreativeMakesCopy = true;
@@ -32,7 +32,7 @@ index 5f53e643f531c566eb05b76cc3a891c2b6bcced5..375eb761e8fb27de5e45d146fea0013c
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -385,6 +386,7 @@ public class PurpurWorldConfig {
@@ -411,6 +412,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);