9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-06 15:41:52 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@07b13f2 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2023-09-15 15:09:55 +03:00
parent 03971add8f
commit fa302f379a
2 changed files with 5 additions and 5 deletions

View File

@@ -1,7 +1,7 @@
group = gq.bxteam.divinemc
version = 1.20.1-R0.1-SNAPSHOT
purpurRef = 7927f53553abfa8c4d4bc4d5eb29dda44144f3dc
purpurRef = 07b13f287c8c63e5b2f23c32c52e5d8012ff2eb7
org.gradle.caching = true
org.gradle.parallel = true

View File

@@ -18,10 +18,10 @@ index 3e36958365bc136516bafbaad0c168f7956406f1..b3594f563489e210544cc573cbe1c13d
setComment("projectile", "Optimizes projectile settings");
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 019d3bbd78fb0b06861979d223915fedb6c99442..d0d5480a406db634062f709f672fefe270be478e 100644
index 3bc7230ca62ebe3426da293e436a962bb0134f85..fd93efca790b75e8300202342c45b845d8e7eb7c 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -89,9 +89,11 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -90,9 +90,11 @@ public class GlobalConfiguration extends ConfigurationPart {
public Timings timings;
public class Timings extends ConfigurationPart.Post {
@@ -36,7 +36,7 @@ index 019d3bbd78fb0b06861979d223915fedb6c99442..d0d5480a406db634062f709f672fefe2
public boolean serverNamePrivacy = false;
public List<String> hiddenConfigEntries = List.of(
"database",
@@ -311,9 +313,9 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -312,9 +314,9 @@ public class GlobalConfiguration extends ConfigurationPart {
public boolean fixEntityPositionDesync = true;
public boolean loadPermissionsYmlBeforePlugins = true;
@Constraints.Min(4)
@@ -47,7 +47,7 @@ index 019d3bbd78fb0b06861979d223915fedb6c99442..d0d5480a406db634062f709f672fefe2
+ public boolean useAlternativeLuckFormula = true; // DivineMC - optimize default values for configs
public boolean useDimensionTypeForCustomSpawners = false;
public boolean strictAdvancementDimensionCheck = false;
}
public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index da7c899fbab162ee197a0593f455ebd9c5286d3c..8f972b42bc952255b5ca03d7dad2e543b08af197 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java