Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 18:28:15 +02: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@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034)
This commit is contained in:
granny
2023-12-17 01:11:46 -08:00
parent 9e1216de50
commit eb3b67d5b2
30 changed files with 100 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0267-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 d974846dda57755cfa33beba76794391beb9b4f3..7c35318e65608b29f6ea0c1481c0af8f0dd8ba5f 100644
index 966f8e764c2ad42cdfc84b5037081121937598b6..741a3cf8df218635cb5430db8d2c61294f7e849b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1578,6 +1578,42 @@ public final class CraftServer implements Server {
@@ -1579,6 +1579,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)));
}
@@ -99,10 +99,10 @@ index 648be304b99793fcec850ee6f3965baf1cd679d8..14df9ede813b64f87d97a1ffa9602436
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f34b24ff4a5afade707206b74b0cf4a3f2f913de..1475964d04ebdcc08b4f67a516216162d8f8db2e 100644
index 791f030b4912b46ef70f3099eb3537515464c54b..dc156ee88786cdb150850cb1adfc4b10b8441b85 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3345,5 +3345,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3355,5 +3355,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}