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@dd11ef8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11102)
This commit is contained in:
granny
2024-07-18 03:57:34 -07:00
parent 2e39567fa1
commit eadfff73ea
35 changed files with 123 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ 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 0efa97d026673aae4fc60f719e18a0ce342a6cab..8bd0bb8b9593347bd249312af3832a4c1a932a5c 100644
index cd3a0bd03956e0149089a90d997893d32d4afac3..1bb18e2870db62102709f3c0176f2a76492c9e1d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1609,6 +1609,42 @@ public final class CraftServer implements Server {
@@ -1618,6 +1618,42 @@ public final class CraftServer implements Server {
public void removeFuel(org.bukkit.Material material) {
net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
}
@@ -52,7 +52,7 @@ 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 685d52605bb2cc8eb7a4065e0e7cf634a22a512a..0056843aabf3a46251eda8667ddb43da59c9d0ab 100644
index e771af8e79f0a89bc88d3c573b062dc7321fb36b..baac0c373d337d4b68d4dc748ec8476510143273 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 {
@@ -99,7 +99,7 @@ index 685d52605bb2cc8eb7a4065e0e7cf634a22a512a..0056843aabf3a46251eda8667ddb43da
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cda45d172f526098a40eaa624ad3a84ed1a888d1..afd7a48f6c85aa00fe53f8ee6a53d790f81a6048 100644
index e5f7647b598cbfacc8840f548bfaa5ed45190e03..dfc15b03996a1a82918c85f3ebea59d54177092a 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 {