Updated Upstream (Gale/Purpur)

Winds-Studio · May 11, 2024 · 38e9d59 · 38e9d59
1 parent c24bd64
commit 38e9d59
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group = cn.dreeam.leaf
 version = 1.20.6-R0.1-SNAPSHOT
 
-galeCommit = 7bede3340526bc44ba04a743e11529feaea9aa45
+galeCommit = 06d5d34300bafadf7b2a6211171ba9b53bb47ab0
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/patches/api/0003-Purpur-API-Changes.patch b/patches/api/0003-Purpur-API-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 8aa793450315a361548f5e1dce4edf18e606bf51
+Commit: 479a7d8583d27167f96d4a418fdb05797d364453
 
 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
@@ -411,7 +411,7 @@ index 30298a629b39bd43ce14b414fc697b2dfcbea89c..ce00af9121de7a910aaea4e0685a06d4
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 4fefbde12a189a481efd0fd0fec06ff0bd02a57b..5f306e9cf3ca332338a82414a420f3c7a58c31fe 100644
+index e5aeb7003575a1900266454dd464a1956556ad89..c0a118f7aac40a240739976f0ecc34e89a8878c9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2310,6 +2310,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -433,7 +433,7 @@ index 4fefbde12a189a481efd0fd0fec06ff0bd02a57b..5f306e9cf3ca332338a82414a420f3c7
          // Leaf start
          @NotNull
          public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
-@@ -2627,4 +2639,104 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2629,4 +2641,104 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      long getLastTickOversleepTime();
      // Gale end - YAPFA - last tick time - API
 

diff --git a/patches/generated-api/0001-Purpur-generated-api-Changes.patch b/patches/generated-api/0001-Purpur-generated-api-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 8aa793450315a361548f5e1dce4edf18e606bf51
+Commit: 479a7d8583d27167f96d4a418fdb05797d364453
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 43f4deacef349502cbb207aafc4f9cb7a75177c5..6b692c24a62e2172116a6b9c371b1c0e2411c27e 100644

diff --git a/patches/server/0010-Purpur-Server-Changes.patch b/patches/server/0010-Purpur-Server-Changes.patch
@@ -9,7 +9,7 @@ Fix-pufferfish-issues.patch
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 8aa793450315a361548f5e1dce4edf18e606bf51
+Commit: 479a7d8583d27167f96d4a418fdb05797d364453
 
 Patches below are removed in this patch:
 Metrics changes in Purpur-config-files.patch
@@ -1098,7 +1098,7 @@ index 759062d219ff490a3cb19e710c4d18e3e08288e0..8f74c2ec5252b6265549589310d74233
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index a9f97783ff2a62041f6fc16a2e64112b42a4188d..fadacb64803eb0cc6583f94b1abcc5ce24adb106 100644
+index db3c9d0d1428549ca6955120661cae38e40f7f8a..f1e4ed6f62472737a534fc457aa483d0725e92e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -77,7 +77,7 @@ public class ServerEntity {
@@ -1111,7 +1111,7 @@ index a9f97783ff2a62041f6fc16a2e64112b42a4188d..fadacb64803eb0cc6583f94b1abcc5ce
      public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
          this.trackedPlayers = trackedPlayers;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cdcbd708b7ee74002428ca8a148d857912ce14ab..bda8c6af98945d3e5fa671b9b3bc016d7b384dc3 100644
+index e3fdd0677b3029be0ddc5f59489f66e28f5c2853..b9d9ef327753272a537bebccc54d9fbc16ed3bdc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -219,6 +219,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1613,7 +1613,7 @@ index 5cedce1f432f6b809b25269242a16477682c824f..6d194797d8fe2cd6e5652d596f4bc66f
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 83196467cf7152ba756f5f6d179ee17c00a4325f..5972362c1c968dbabb799824227c6ae3aef0b61e 100644
+index c3a1969e7d3e42b2f0fd0dd0a3d6a5f1dc9b1a1e..bc14f7ae7c5d3dab3a3fc1ce56c975c32943076c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -86,6 +86,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack

diff --git a/patches/server/0033-Petal-Multithreaded-Tracker.patch b/patches/server/0033-Petal-Multithreaded-Tracker.patch
@@ -68,7 +68,7 @@ index d8b22d51d28692182cd75affd6cb552971fed42f..63aa94b0004aa2ea5de5dce775453704
      public FullChunkStatus status;
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c700bb52cd7cfc264c0353d3b832547f7e336e32..da9b182bb8d7d4457a66ecbc2adb289956780693 100644
+index 1dc4ccbd999964eee18a420c8166e1a8b5f9a3a0..822604900ccfe18d8e73c746af2d3d0fc36a2734 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1144,8 +1144,35 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -193,10 +193,10 @@ index 4f91107f9ae42f96c060c310596db9aa869a8dbc..faad96f04af2e368f0276ade417dd1ba
      public boolean visible = true;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index fadacb64803eb0cc6583f94b1abcc5ce24adb106..504711d92cd50f9aa2026cb2311540a5a7825790 100644
+index f1e4ed6f62472737a534fc457aa483d0725e92e3..7c303c4f1996139a0a5401a66413a58a10edbf55 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -287,7 +287,11 @@ public class ServerEntity {
+@@ -295,7 +295,11 @@ public class ServerEntity {
 
      public void removePairing(ServerPlayer player) {
          this.entity.stopSeenByPlayer(player);
@@ -209,7 +209,7 @@ index fadacb64803eb0cc6583f94b1abcc5ce24adb106..504711d92cd50f9aa2026cb2311540a5
      }
 
      public void addPairing(ServerPlayer player) {
-@@ -295,7 +299,7 @@ public class ServerEntity {
+@@ -303,7 +307,7 @@ public class ServerEntity {
 
          Objects.requireNonNull(list);
          this.sendPairingData(player, list::add);
@@ -218,7 +218,7 @@ index fadacb64803eb0cc6583f94b1abcc5ce24adb106..504711d92cd50f9aa2026cb2311540a5
          this.entity.startSeenByPlayer(player);
      }
 
-@@ -384,19 +388,29 @@ public class ServerEntity {
+@@ -392,19 +396,29 @@ public class ServerEntity {
 
          if (list != null) {
              this.trackedDataValues = datawatcher.getNonDefaultValues();
@@ -252,7 +252,7 @@ index fadacb64803eb0cc6583f94b1abcc5ce24adb106..504711d92cd50f9aa2026cb2311540a5
 
              set.clear();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2d649d98985203005f3e423d61e88a8ec7dbc380..aa831bc5ffa44c55da9eea33c72df1d6d68c861a 100644
+index e354a9c72ec61896d9752d804517e57a412daea5..2cb1ce10c24f3a18d2d486c6d63cd24b1f3de2be 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2591,7 +2591,7 @@ public class ServerLevel extends Level implements WorldGenLevel {

diff --git a/patches/server/0047-PaperPR-Rewrite-framed-map-tracker-ticking.patch b/patches/server/0047-PaperPR-Rewrite-framed-map-tracker-ticking.patch
@@ -16,10 +16,10 @@ now is just updating dirty map/decoration data.
 When no bukkit renderers are added to the map, we also re-use the same packet for all players who are tracking it which avoids a lot of work.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 504711d92cd50f9aa2026cb2311540a5a7825790..db3936d43b39056dd4138278a23c6992b950bbae 100644
+index 7c303c4f1996139a0a5401a66413a58a10edbf55..bed271712d4040983340ad001c20eaf07b0838a0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -113,27 +113,40 @@ public class ServerEntity {
+@@ -120,27 +120,40 @@ public class ServerEntity {
 
          Entity entity = this.entity;
 
@@ -65,7 +65,7 @@ index 504711d92cd50f9aa2026cb2311540a5a7825790..db3936d43b39056dd4138278a23c6992
                      }
                  }
 
-@@ -380,6 +393,19 @@ public class ServerEntity {
+@@ -388,6 +401,19 @@ public class ServerEntity {
              }
          }