Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@41bc31b Update paperweight to 1.7.3 (#11445)
PaperMC/Paper@e17eb6b Improve entity effect API (#11444)
PaperMC/Paper@7b03141 Add startingBrewTime (#11406)
PaperMC/Paper@355b1cb Add API for explosions to damage the explosion cause (#11180)
PaperMC/Paper@6d7a438 Call bucket events for cauldrons (#7486)
This commit is contained in:
granny
2024-09-29 00:15:17 -07:00
parent 501e7c5124
commit 2a50638047
25 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0257-Debug-Marker-API.patch
View File

@@ -52,10 +52,10 @@ index ad71ba70b24481120e303e174ab07c7a31a068c6..300c8a94771d56e6bb6da692092882c3
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 925f51ec046d9cc411dde5048cfdcd47507f80f8..40712284682f2805858be68fe9e5428b376a5943 100644
index f48232e3309cb07ce7b11676b24c62982e3c65a3..ab16b5a8381fcd5f0890e0fc0801a6e88ce8a740 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2347,6 +2347,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2349,6 +2349,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public float getLocalDifficultyAt(Location location) {
return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
}
@@ -99,10 +99,10 @@ index 925f51ec046d9cc411dde5048cfdcd47507f80f8..40712284682f2805858be68fe9e5428b
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index aa2e0d3c0b6c8c1bca3e0c4527a88b1c97a6418c..eeeac1e7e82f45a7cec44e9d6388a62c477e096a 100644
index b6db9d9326f30deb02d5530e014bd3abbaf9c54e..531632ed0a1adaf87acf9bdd651001e9157b1200 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3602,5 +3602,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3617,5 +3617,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}