Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@52fb265 Optimize custom map rendering (#11000) PaperMC/Paper@661839e Fix and optimize getChunkCount (#11610)
PurpurMC · Nov 12, 2024 · 7a01fd8 · 7a01fd8
1 parent e2e8c61
commit 7a01fd8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.3-R0.1-SNAPSHOT
 
 mcVersion = 1.21.3
-paperCommit = 1ef4c0e7ff4cdbce7939804918c8d492f1e8ce1c
+paperCommit = 661839e0334b68600bfcf58507c932f5743b7d90
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -389,7 +389,7 @@ index 0000000000000000000000000000000000000000..ae2464920c9412ac90b819a540ee58be
 +	
 +}
 diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad124466bf5 100644
+index 55a46db9d73885ea967ac929013906b687e476bb..b99796629100c7d5fff1b7f84026001e0013b477 100644
 --- a/src/main/java/org/bukkit/map/MapPalette.java
 +++ b/src/main/java/org/bukkit/map/MapPalette.java
 @@ -1,6 +1,7 @@
@@ -400,7 +400,7 @@ index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad1
  import java.awt.Color;
  import java.awt.Graphics2D;
  import java.awt.Image;
-@@ -40,7 +41,7 @@ public final class MapPalette {
+@@ -45,7 +46,7 @@ public final class MapPalette {
      }
 
      @NotNull
@@ -409,7 +409,7 @@ index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad1
          c(0, 0, 0, 0), c(0, 0, 0, 0), c(0, 0, 0, 0), c(0, 0, 0, 0),
          c(89, 125, 39), c(109, 153, 48), c(127, 178, 56), c(67, 94, 29),
          c(174, 164, 115), c(213, 201, 140), c(247, 233, 163), c(130, 123, 86),
-@@ -211,9 +212,15 @@ public final class MapPalette {
+@@ -216,9 +217,15 @@ public final class MapPalette {
          temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
 
          byte[] result = new byte[temp.getWidth() * temp.getHeight()];

diff --git a/patches/server/0247-Add-local-difficulty-api.patch b/patches/server/0247-Add-local-difficulty-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d41c81158c00931e6b11093cce141f6a3085ba05..3be5c25f8ce15e2f035c92e5fe90693e0236967d 100644
+index 3134fab97260897601d7c8e2810f11b8be86dbec..f1e954fc1a1cd65c5ce2e43fab57a3cd81e5af5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2399,6 +2399,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2391,6 +2391,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }
 

diff --git a/patches/server/0251-Debug-Marker-API.patch b/patches/server/0251-Debug-Marker-API.patch
@@ -52,10 +52,10 @@ index cc645ae4f1d17784b6e966f78b8b6eb0117ea9a2..5af6fb52eaf99cf92aec8435c73a3003
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3be5c25f8ce15e2f035c92e5fe90693e0236967d..ea1b4f0073f775fdd18eb080886d60c71a08ab2c 100644
+index f1e954fc1a1cd65c5ce2e43fab57a3cd81e5af5b..9a104c48bb1a92655b1feaab3e01a3be6ec7d942 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2403,6 +2403,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2395,6 +2395,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public float getLocalDifficultyAt(Location location) {
          return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
      }

diff --git a/patches/server/0278-Explorer-Map-API.patch b/patches/server/0278-Explorer-Map-API.patch
@@ -29,10 +29,10 @@ index ae321b3b8d98e42ef07fd1f0f738c1a2b428f6db..26da9e7c25ef6a89482838010d8ed6bc
      // CraftBukkit start
      public final CraftMapView mapView;
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
-index 0cbbd915631904fe8c6effefb92895422b33eff6..aef19cfbecb4ddfc8dc71c4f3b2a011364c12dc2 100644
+index cf0920e5f84b35647882fb963e9972af4e8427e0..e30c851acf49a425cd4fd409a6d5bbb2ff836e0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
-@@ -47,4 +47,10 @@ public class CraftMapRenderer extends MapRenderer {
+@@ -49,4 +49,10 @@ public class CraftMapRenderer extends MapRenderer {
          }
      }