Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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@a203544 build: Compile against and shade the filtered jar (#9747)
PaperMC/Paper@bd38e03 Updated Upstream (Bukkit/CraftBukkit) (#10379)
PaperMC/Paper@a774fba feat: Entity#teleportAsync method with TeleportFlags (#10371)
PaperMC/Paper@06361fa Fix invalid block entities created during world gen (#10375)
PaperMC/Paper@bbee11f Deprecate Bukkit#getLogger (#10388)
PaperMC/Paper@d8456ee Don't throw NPE for unplaced blockstate on #getDrops (#10366)
PaperMC/Paper@182e79b Add more item use API (#10304)
PaperMC/Paper@acf838f Backport some stuff from the generators branch (#10365)
PaperMC/Paper@3d31e45 Add BlockBreakProgressUpdateEvent (#10300)
PaperMC/Paper@8e75001 Disable vertical air friction when item entities have friction disabled (#10369)
PaperMC/Paper@241d8e2 Ignore minecart in activation range (#10359)
PaperMC/Paper@1207162 Allow player-list API to self un/list (#10358)
This commit is contained in:
granny
2024-04-06 19:03:06 -07:00
parent bd0d44dca7
commit b64f4f50e2
37 changed files with 153 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0014-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 13eeaf8a59c83ecfdbdb8cf62e78fd70b00d170b..812d903e8883ab087ec7ae154d76dceb019bac17 100644
index a7ab6c954c67fe802ebd4611a8c355d19873a465..8ff0b6c0bab4c8972de1c59b7a9c4e80db350fba 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2888,5 +2888,14 @@ public final class Bukkit {
@@ -2894,5 +2894,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 13eeaf8a59c83ecfdbdb8cf62e78fd70b00d170b..812d903e8883ab087ec7ae154d76dceb
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5e44a3cb8b8865e760d2f600af1351259b2867fe..45287918b72c3053f21b56cd33b6daf692c9888a 100644
index ef56a9a52cad11377f4a58b92bcb1bc2740002df..846707b827e9f542c7a0b3191ea92b602dd4aa63 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2532,5 +2532,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2538,5 +2538,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();