Update Upstream (Purpur)

2026-01-04 15:31:43 +00:00 · 2023-04-11 22:44:13 +03:00
parent 6416f59f0e
commit a8dcd0aae1
9 changed files with 20 additions and 20 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group=gq.bxteam.divinemc

 version=1.19.4-R0.1-SNAPSHOT
-purpurRef=285f9f683d611c151582f94745f4be3e5b52f81e
+purpurRef=f952106e1ba20e799dbe0e67c1d241e3f286b5f4

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0003-Rework-Spigot-Deprecations.patch
+++ b/patches/api/0003-Rework-Spigot-Deprecations.patch
@@ -59,10 +59,10 @@ index fc4d3bcd9b16097086fef7975274d825b65adb10..e485975dbb6973d2b21259c4e4d5d751
     void resetMaxHealth();
 }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 85c5987758b1d5145843705205dc99164c5f9f44..f427855ba2bdf8211a3b8b41129c22bf24a31bfb 100644
+index 43cef54d355c8a1b6a8cd6be89a6a805e9f88566..457facce52256c42c3c249ec7f4b3ed4f0269618 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -278,14 +278,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -279,14 +279,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      * Returns true if the entity is supported by a block.
      *
      * This value is a state updated by the client after each movement.
--- a/patches/api/0005-Paper-PR-BoneMeal-API.patch
+++ b/patches/api/0005-Paper-PR-BoneMeal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR - BoneMeal API


 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ad00e30379df52575bf2697ccb32abb176ecd47a..75f511532953d5074b22ef938874c65983a992e5 100644
+index cf8b93aa5787e96f54e2ffe2a0f157b0e53e2c5c..5bbab861056ff3277f2778c3cb2eb9367cdab012 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4146,4 +4146,20 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4157,4 +4157,20 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
             }
         }
     }
--- a/patches/server/0004-Optimize-default-values-for-configs.patch
+++ b/patches/server/0004-Optimize-default-values-for-configs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize default values for configs


 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 62b2a3a44929b80b813bc24a33cd1f5049fecbb2..27370498849a10977f86e478f10b40a535de39a4 100644
+index 47e77541e558e18758ae0fcc2aa4e47261e928b6..00b61ee9ea84e270df52af68e622a1c42dec3c54 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -211,7 +211,7 @@ public class PufferfishConfig {
@@ -18,19 +18,19 @@ index 62b2a3a44929b80b813bc24a33cd1f5049fecbb2..27370498849a10977f86e478f10b40a5
 
         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 6bf14183a3fcd2b3d166752ce33240d2ff1ffa7c..26ff05055d8e9df6a9d88e5a8160f9060dcded38 100644
+index 8d442c5a498ecf288a0cc0c54889c6e2fda849ce..fc60346bc7db6fba62dfa38bbc3d7d1280e7a892 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -55,7 +55,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -52,7 +52,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+     public class Timings extends ConfigurationPart.Post {
         public boolean enabled = true;
-         public boolean reallyEnabled = false;
         public boolean verbose = true;
 -        public String url = "https://timings.aikar.co/";
 +        public String url = "https://timin.gs/"; // DivineMC - optimize default values for configs
         public boolean serverNamePrivacy = false;
         public List<String> hiddenConfigEntries = List.of(
             "database",
-@@ -291,9 +291,9 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -280,9 +280,9 @@ public class GlobalConfiguration extends ConfigurationPart {
         public boolean fixEntityPositionDesync = true;
         public boolean loadPermissionsYmlBeforePlugins = true;
         @Constraints.Min(4)
--- a/patches/server/0013-Paper-PR-Add-Movement-Direction-API.patch
+++ b/patches/server/0013-Paper-PR-Add-Movement-Direction-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR - Add Movement Direction API


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index cf7ba8724ab68f6955b5ebfa1ba46c4397da32b3..1a5fe70616873ab2fc3f60b788e6315d1156562d 100644
+index 7ef5980f7321662aa7034a74c2f6926846425db9..d26fb49a39880d650a82b59925d40b8d09fbc84b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -979,6 +979,24 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -980,6 +980,24 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         throw new UnsupportedOperationException("Cannot set the hurt direction on a non player");
     }
 
--- a/patches/server/0014-Paper-PR-BoneMeal-API.patch
+++ b/patches/server/0014-Paper-PR-BoneMeal-API.patch
@@ -38,10 +38,10 @@ index c26665bc59c18c4da467fb6ae33e51a65ecf1de6..bf65490f0239fc6d9d9c101ebce5845d
                 }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c6a3b59c65466f9f2b16cefe0059a6e5dd84044c..2f93d2fb806036ac3ba4a25fffdcb4ffcb423035 100644
+index b5415f0c65db728f4a935b87b54fa14b68d31bc4..4d0c69c0d2aa7eb625a949a9e6c6c1a5d7a25057 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2436,5 +2436,43 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2446,5 +2446,43 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
         return this.adventure$pointers;
     }
--- a/patches/server/0016-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
+++ b/patches/server/0016-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch
@@ -50,10 +50,10 @@ index 6b0bdc266109cdfb874f08bf74323603921d2260..a355470f6b0e8286a178ad279ad93bca
 +}
 \ 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
-index b04e905534baf35e50d9d09921581e04edd19fc5..c6c6b074e7a397c4cd87c3f1d0aeff5232c48c05 100644
+index 33d4c1af86382cc3343d5db42283b27f69f52374..9679cce1a836add4aee343087370a2fc4d2d132e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -301,11 +301,13 @@ public abstract class PlayerList {
+@@ -302,11 +302,13 @@ public abstract class PlayerList {
         Component joinMessage = ichatmutablecomponent; // Paper - Adventure
 
         playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
--- a/patches/server/0020-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
+++ b/patches/server/0020-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
@@ -20,7 +20,7 @@ index 0a8baeb94ae553c4759b065eafd9e242153cf991..abf8ddccce6ec9d893038d1fafdca617
 }
 \ 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
-index 9d96965d7940fdfe1087ce61c076001bf4d11b4a..4326a21ca94322acdc114f091498967239b61e9a 100644
+index 9679cce1a836add4aee343087370a2fc4d2d132e..10d48bc54da61c3fefac177006daf9c0bc4c4687 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -102,6 +102,7 @@ import net.minecraft.world.scores.PlayerTeam;
@@ -31,7 +31,7 @@ index 9d96965d7940fdfe1087ce61c076001bf4d11b4a..4326a21ca94322acdc114f0914989672
 
 // CraftBukkit start
 import java.util.stream.Collectors;
-@@ -210,7 +211,14 @@ public abstract class PlayerList {
+@@ -211,7 +212,14 @@ public abstract class PlayerList {
             if (bWorld != null) {
                 resourcekey = ((CraftWorld) bWorld).getHandle().dimension();
             } else {
--- a/patches/server/0028-lithium-collections.gamerules.patch
+++ b/patches/server/0028-lithium-collections.gamerules.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] lithium: collections.gamerules


 diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 29d1f78dbc8410f9292f409b17705acde55979df..6310b0e2daedddd5b1e9d983d43baa4653e22344 100644
+index 6fa00d9239546aa82b9e92e25a33103868084c38..d91f1c58d8176036737ed2ad7914d27c3d684d6c 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
@@ -27,6 +27,7 @@ import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
@@ -23,5 +23,5 @@ index 29d1f78dbc8410f9292f409b17705acde55979df..6310b0e2daedddd5b1e9d983d43baa46
 -        this.rules = rules;
 +        this.rules = new Object2ObjectOpenHashMap<>(rules); // DivineMC - lithium: collections.gamerules
 
-         // Pufferfish start
+         // Paper start
         int arraySize = rules.keySet().stream().mapToInt(key -> key.gameRuleIndex).max().orElse(-1) + 1;