Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-30 12:19:13 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@2a38801 adds ridable option to zombie horse and skeleton horse, fixes #1458
PurpurMC/Purpur@4b1a082 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2023-11-20 03:00:02 +03:00
parent 2f8af05547
commit f550943cf8
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0004-Optimize-default-values-for-configs.patch
View File

@@ -36,10 +36,10 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..e51f427eadc0c3b60754d0a67bea3892
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 ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd2e5485a6 100644
index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..90e30ad72b0947b66e65f85bb75112ee78f84bab 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -127,9 +127,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -151,9 +151,9 @@ public class WorldConfiguration extends ConfigurationPart {
public ArmorStands armorStands;
@@ -52,7 +52,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
}
public Markers markers;
@@ -227,8 +227,8 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -251,8 +251,8 @@ public class WorldConfiguration extends ConfigurationPart {
public Behavior behavior;
public class Behavior extends ConfigurationPart {
@@ -63,7 +63,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
public int experienceMergeMaxValue = -1;
public boolean shouldRemoveDragon = false;
public boolean zombiesTargetTurtleEggs = true;
@@ -275,7 +275,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -276,7 +276,7 @@ public class WorldConfiguration extends ConfigurationPart {
public int playerInsomniaStartTicks = 72000;
public int phantomsSpawnAttemptMinSeconds = 60;
public int phantomsSpawnAttemptMaxSeconds = 119;
@@ -72,7 +72,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
@BelowZeroToEmpty
public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT;
public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot;
@@ -286,7 +286,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -287,7 +287,7 @@ public class WorldConfiguration extends ConfigurationPart {
}
public boolean disablePlayerCrits = false;
@@ -81,7 +81,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
public PillagerPatrols pillagerPatrols;
public class PillagerPatrols extends ConfigurationPart {
@@ -380,7 +380,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -381,7 +381,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Environment extends ConfigurationPart {
public boolean disableThunder = false;
public boolean disableIceAndSnow = false;
@@ -90,7 +90,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
public boolean disableExplosionKnockback = false;
public boolean generateFlatBedrock = false;
public FrostedIce frostedIce;
@@ -426,7 +426,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -427,7 +427,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Maps extends ConfigurationPart {
public int itemFrameCursorLimit = 128;
@@ -99,7 +99,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
}
public Fixes fixes;
@@ -451,7 +451,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -452,7 +452,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Hopper extends ConfigurationPart {
public boolean cooldownWhenFull = true;
public boolean disableMoveEvent = false;
@@ -108,7 +108,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
}
public Collisions collisions;
@@ -459,9 +459,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -460,9 +460,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Collisions extends ConfigurationPart {
public boolean onlyPlayersCollide = false;
public boolean allowVehicleCollisions = true;
@@ -120,7 +120,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
public boolean allowPlayerCrammingDamage = false;
}
@@ -469,18 +469,31 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -470,18 +470,31 @@ public class WorldConfiguration extends ConfigurationPart {
public class Chunks extends ConfigurationPart {
public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -162,7 +162,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
});
public boolean flushRegionsOnSave = false;
}
@@ -495,11 +508,22 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -496,11 +509,22 @@ public class WorldConfiguration extends ConfigurationPart {
public TickRates tickRates;
public class TickRates extends ConfigurationPart {
@@ -190,7 +190,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
}
@Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
@@ -508,7 +532,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -509,7 +533,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class FeatureSeeds extends ConfigurationPart {
@SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
@Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -199,7 +199,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd
@Setting(FeatureSeedsGeneration.FEATURES_KEY)
public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
@@ -522,9 +546,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -523,9 +547,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart {
public int lightQueueSize = 20;