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

Update Upstream (Purpur)

Browse Source
This commit is contained in:
NONPLAYT
2023-04-05 22:16:41 +03:00
parent 5ee96a2193
commit af8105690d
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group=gq.bxteam.divinemc group=gq.bxteam.divinemc
version=1.19.4-R0.1-SNAPSHOT version=1.19.4-R0.1-SNAPSHOT
purpurRef=bd5c4b67e6bdb6d2d6d67fd9bc63bbd99b24ab78 purpurRef=285f9f683d611c151582f94745f4be3e5b52f81e
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

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

@@ -43,7 +43,7 @@ index 6bf14183a3fcd2b3d166752ce33240d2ff1ffa7c..26ff05055d8e9df6a9d88e5a8160f906
public boolean useDimensionTypeForCustomSpawners = false; public boolean useDimensionTypeForCustomSpawners = false;
public boolean strictAdvancementDimensionCheck = false; public boolean strictAdvancementDimensionCheck = false;
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067c355cd3d 100644 index ee430563b99e48cd722c2897e4729936457d3017..2453b32ddcbd1cd3615621fda4a92b13c675d454 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -115,9 +115,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -115,9 +115,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -58,8 +58,8 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
+ public boolean tick = false; + public boolean tick = false;
} }
public Spawning spawning; public Markers markers;
@@ -201,8 +201,8 @@ public class WorldConfiguration extends ConfigurationPart { @@ -207,8 +207,8 @@ public class WorldConfiguration extends ConfigurationPart {
public Behavior behavior; public Behavior behavior;
public class Behavior extends ConfigurationPart { public class Behavior extends ConfigurationPart {
@@ -70,7 +70,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
public int experienceMergeMaxValue = -1; public int experienceMergeMaxValue = -1;
public boolean shouldRemoveDragon = false; public boolean shouldRemoveDragon = false;
public boolean zombiesTargetTurtleEggs = true; public boolean zombiesTargetTurtleEggs = true;
@@ -249,7 +249,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -255,7 +255,7 @@ public class WorldConfiguration extends ConfigurationPart {
public int playerInsomniaStartTicks = 72000; public int playerInsomniaStartTicks = 72000;
public int phantomsSpawnAttemptMinSeconds = 60; public int phantomsSpawnAttemptMinSeconds = 60;
public int phantomsSpawnAttemptMaxSeconds = 119; public int phantomsSpawnAttemptMaxSeconds = 119;
@@ -79,7 +79,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
public double zombieVillagerInfectionChance = -1.0; public double zombieVillagerInfectionChance = -1.0;
public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot; public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot;
@@ -259,7 +259,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -265,7 +265,7 @@ public class WorldConfiguration extends ConfigurationPart {
} }
public boolean disablePlayerCrits = false; public boolean disablePlayerCrits = false;
@@ -88,7 +88,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
public PillagerPatrols pillagerPatrols; public PillagerPatrols pillagerPatrols;
public class PillagerPatrols extends ConfigurationPart { public class PillagerPatrols extends ConfigurationPart {
@@ -317,7 +317,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -323,7 +323,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Environment extends ConfigurationPart { public class Environment extends ConfigurationPart {
public boolean disableThunder = false; public boolean disableThunder = false;
public boolean disableIceAndSnow = false; public boolean disableIceAndSnow = false;
@@ -97,7 +97,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
public boolean disableExplosionKnockback = false; public boolean disableExplosionKnockback = false;
public boolean generateFlatBedrock = false; public boolean generateFlatBedrock = false;
public FrostedIce frostedIce; public FrostedIce frostedIce;
@@ -363,7 +363,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -369,7 +369,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Maps extends ConfigurationPart { public class Maps extends ConfigurationPart {
public int itemFrameCursorLimit = 128; public int itemFrameCursorLimit = 128;
@@ -106,7 +106,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
} }
public Fixes fixes; public Fixes fixes;
@@ -389,7 +389,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -395,7 +395,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Hopper extends ConfigurationPart { public class Hopper extends ConfigurationPart {
public boolean cooldownWhenFull = true; public boolean cooldownWhenFull = true;
public boolean disableMoveEvent = false; public boolean disableMoveEvent = false;
@@ -115,7 +115,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
} }
public Collisions collisions; public Collisions collisions;
@@ -397,9 +397,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -403,9 +403,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Collisions extends ConfigurationPart { public class Collisions extends ConfigurationPart {
public boolean onlyPlayersCollide = false; public boolean onlyPlayersCollide = false;
public boolean allowVehicleCollisions = true; public boolean allowVehicleCollisions = true;
@@ -127,7 +127,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
public boolean allowPlayerCrammingDamage = false; public boolean allowPlayerCrammingDamage = false;
} }
@@ -407,18 +407,31 @@ public class WorldConfiguration extends ConfigurationPart { @@ -413,18 +413,31 @@ public class WorldConfiguration extends ConfigurationPart {
public class Chunks extends ConfigurationPart { public class Chunks extends ConfigurationPart {
public AutosavePeriod autoSaveInterval = AutosavePeriod.def(); public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -169,7 +169,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
}); });
} }
@@ -432,11 +445,22 @@ public class WorldConfiguration extends ConfigurationPart { @@ -438,11 +451,22 @@ public class WorldConfiguration extends ConfigurationPart {
public TickRates tickRates; public TickRates tickRates;
public class TickRates extends ConfigurationPart { public class TickRates extends ConfigurationPart {
@@ -197,7 +197,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
} }
@Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
@@ -444,7 +468,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -450,7 +474,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class FeatureSeeds extends ConfigurationPart.Post { public class FeatureSeeds extends ConfigurationPart.Post {
@Setting(FeatureSeedsGeneration.GENERATE_KEY) @Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -206,7 +206,7 @@ index 51cf0014c4229fc8671804d885b6381996810130..6becc866b124945bbbc92e2681471067
@Setting(FeatureSeedsGeneration.FEATURES_KEY) @Setting(FeatureSeedsGeneration.FEATURES_KEY)
public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>(); public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
@@ -458,9 +482,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -464,9 +488,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart { public class Misc extends ConfigurationPart {
public int lightQueueSize = 20; public int lightQueueSize = 20;

4
patches/server/0016-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
View File

@@ -50,10 +50,10 @@ index 6b0bdc266109cdfb874f08bf74323603921d2260..a355470f6b0e8286a178ad279ad93bca
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 1a288ebcaade0cc44c7d09478f4f2f8eee7a4269..9d96965d7940fdfe1087ce61c076001bf4d11b4a 100644 index b04e905534baf35e50d9d09921581e04edd19fc5..c6c6b074e7a397c4cd87c3f1d0aeff5232c48c05 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -297,11 +297,13 @@ public abstract class PlayerList { @@ -301,11 +301,13 @@ public abstract class PlayerList {
Component joinMessage = ichatmutablecomponent; // Paper - Adventure Component joinMessage = ichatmutablecomponent; // Paper - Adventure
playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot()); playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());