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@2fa8efc Updated Upstream (Bukkit/CraftBukkit) (#9485)
PaperMC/Paper@508a295 Only erase allay memory on non-item targets (#9570)
PaperMC/Paper@31358d5 API for updating recipes on clients (#6463)
PaperMC/Paper@8fe8ca6 Add clickable version on version command (#9347)
PaperMC/Paper@d6d2b6f Only capture actual tree growth (#6464)
This commit is contained in:
granny
2023-08-05 20:40:50 -07:00
parent 22eb20c622
commit 0e36fd08b8
48 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0274-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 2138d98b83bfee76d0c67272b8e10d14f2da7a3f..9ff6d2ae803e4ebab0d76c8eb20b6524b7d77786 100644
index d84e3e0f24c553acdbc71d096e1f000c669313cc..1f70b0e41915516a4826ad3ffb05876325ad941a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1541,6 +1541,42 @@ public final class CraftServer implements Server {
@@ -1566,6 +1566,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 4720939d138300ed410871e40d3d2800224a7987..f30c6e09adb3a6aa485357f859fc2a22
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 71f86d2461f9f7f49435615c7fdb1724505e52a5..34adc4a82e44c8ecec7a2f21d1df920c80d6f074 100644
index eee650dc8ea13657d6be2530d8f637522a2e1303..7c2848019f4829754156d2a163d7974d9390d75f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3247,5 +3247,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3279,5 +3279,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}