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@3271119 Fix SculkBloomEvent firing for block entity loading (#11306)
PaperMC/Paper@2fdb2e9 Fix structure check API (#11307)
  • Loading branch information
granny committed Aug 22, 2024
1 parent 568a028 commit ef12ede
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 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.1-R0.1-SNAPSHOT

mcVersion = 1.21.1
paperCommit = e4b38b4f8c2d6647a36865b64f63df771b5e4041
paperCommit = 2fdb2e9dcdfb127cb99134f9bec60dcc2a6954d2

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0251-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 362ca138a5cd5ad19f1300015c2571794adc3649..e771af8e79f0a89bc88d3c573b062dc7321fb36b 100644
index ffd284f0e25c6f20672f7225aafd37e6c87ccf03..eeeb4452956737056ecd9edcd9e9b825b2ad0fa6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2338,6 +2338,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2333,6 +2333,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
}

Expand Down
8 changes: 4 additions & 4 deletions patches/server/0257-Debug-Marker-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Debug Marker API


diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e29fd833094840091cb6dfb788fe1c77896c4cc3..9b31b7edecbacb16f24deea619e69314959bea85 100644
index cac4b62cc3ab9e726b8c3ee62bdaca3410c07298..2acc914e31bcba0e570725dc4dc8449d0331ab90 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1622,6 +1622,42 @@ public final class CraftServer implements Server {
Expand Down Expand Up @@ -52,10 +52,10 @@ index e29fd833094840091cb6dfb788fe1c77896c4cc3..9b31b7edecbacb16f24deea619e69314

@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e771af8e79f0a89bc88d3c573b062dc7321fb36b..baac0c373d337d4b68d4dc748ec8476510143273 100644
index eeeb4452956737056ecd9edcd9e9b825b2ad0fa6..744e8486454b783697fb28f5441d0002d877a9b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2342,6 +2342,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2337,6 +2337,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 Expand Up @@ -99,7 +99,7 @@ index e771af8e79f0a89bc88d3c573b062dc7321fb36b..baac0c373d337d4b68d4dc748ec84765

@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e5f7647b598cbfacc8840f548bfaa5ed45190e03..dfc15b03996a1a82918c85f3ebea59d54177092a 100644
index 33669c2d904d565fdc1575f3905ba796f0fe9e68..d8a73f97de936c7c3f9a275338c9f130400f65e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3603,5 +3603,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
Expand Down

0 comments on commit ef12ede

Please sign in to comment.