Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
granny committed Jun 19, 2024
1 parent a122fd7 commit 783acfe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0248-Add-local-difficulty-api.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0254-Debug-Marker-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

0 comments on commit 783acfe

Please sign in to comment.