Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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@eb0693f Fix EntityDeathEvent cancellation (#9323)
PaperMC/Paper@f8cfdd4 Fix SmithingInventory helper slot methods for 1.20 (#9325)
PaperMC/Paper@de19eb8 fix incorrectly updated move vector checking patch (#9328)
PaperMC/Paper@87dfff4 Implement BossBarViewer on Player (#9332)
PaperMC/Paper@2d09115 Use net.kyori.ansi for console logging (#9313)
PaperMC/Paper@b48e2e3 Fix dev bundle generation
PaperMC/Paper@c287e92 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)
PaperMC/Paper@2e363c7 1.20.1 (#9333)
This commit is contained in:
Ben Kerllenevich
2023-06-13 13:40:15 -04:00
parent 788c14f02c
commit cc465d63cd
103 changed files with 302 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0009-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b0bc2df41506770e2854a287813f1c53f003eda1..f30ddfb1a5800542d456597b93d4ee66c7f1d2ee 100644
index ef36d793ab77c7b7208f8f5994815599cff470d1..68b218e991c9d73f4ec52a1d5c6bba9140427472 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2483,4 +2483,15 @@ public final class Bukkit {
@@ -2500,4 +2500,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index b0bc2df41506770e2854a287813f1c53f003eda1..f30ddfb1a5800542d456597b93d4ee66
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9fac86bb13066ff685378ef601857730bd74964b..4dcfe692385cdeb75309bdff4bd90fa6036b36c2 100644
index 861e193e7c1fe1b8e69e22b5c80f391701446bc5..5a59443e3f8fce692af148bf01dd59cddcbe683a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2174,4 +2174,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2187,4 +2187,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end