From 783acfed928ebdbbe2c8c28d9f6fa26f39f3b824 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Wed, 19 Jun 2024 04:25:27 +0000
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3b1c85b Execute chunk tasks while waiting for chunk load in isChunkGenerated
PaperMC/Paper@4ea696f Add ticket for chunk load in isChunkGenerated
---
 gradle.properties                                  | 2 +-
 patches/server/0248-Add-local-difficulty-api.patch | 4 ++--
 patches/server/0254-Debug-Marker-API.patch         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index cc80c1482..1fada35a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
-paperCommit = d23825aa56dbe22140b4191e41ae4cf8f7188ebd
+paperCommit = 4ea696ffe4c52891d67f98f6cbe12e193539d48d
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0248-Add-local-difficulty-api.patch b/patches/server/0248-Add-local-difficulty-api.patch
index 593fec000..8c16f600e 100644
--- a/patches/server/0248-Add-local-difficulty-api.patch
+++ b/patches/server/0248-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 95de729f0a02a202632ea85a4061607d632588e9..4fd2908d726d9da48bddbd34a3461cbb3de37056 100644
+index 8045d6c9398d1c88595da6e41aa1ed27fb6fbad0..685d52605bb2cc8eb7a4065e0e7cf634a22a512a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2337,6 +2337,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2338,6 +2338,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }
  
diff --git a/patches/server/0254-Debug-Marker-API.patch b/patches/server/0254-Debug-Marker-API.patch
index 98ccf73c6..67c904fd7 100644
--- a/patches/server/0254-Debug-Marker-API.patch
+++ b/patches/server/0254-Debug-Marker-API.patch
@@ -52,10 +52,10 @@ index 0efa97d026673aae4fc60f719e18a0ce342a6cab..8bd0bb8b9593347bd249312af3832a4c
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4fd2908d726d9da48bddbd34a3461cbb3de37056..b008dab82d6a4aafb3cd8d625e87c103b7f6395f 100644
+index 685d52605bb2cc8eb7a4065e0e7cf634a22a512a..0056843aabf3a46251eda8667ddb43da59c9d0ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2341,6 +2341,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2342,6 +2342,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public float getLocalDifficultyAt(Location location) {
          return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
      }