Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@f6a69de Undeprecate getOfflinePlayer (#7773)
PaperMC/Paper@a117da6 Add PlayerStopUsingItemEvent (#7787)
PaperMC/Paper@f3a8a0b FallingBlock auto expire setting (#7037)
PaperMC/Paper@4219389 Don't tick markers (#7299)
PaperMC/Paper@2515bc4 Improve configurable door difficulty (#6985)
PaperMC/Paper@8c9d98e Clean unused field for Configurable door breaking difficulty (#7793)
PaperMC/Paper@b831784 Only log for passenger / vehicle world mismatch
PaperMC/Paper@7a6163b Add Alternate Current's redstone implementation as an alternative to Vanilla and Eigencraft's. (#7701)
PaperMC/Paper@1a17a83 Move redstone config changes to Eigencraft patch
This commit is contained in:
Encode42
2022-05-07 14:07:40 -04:00
parent 4e4f0df40d
commit 492436a23b
27 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0011-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 5dc245bfbc1d466ab96294bbc10ead1fcec4f841..010f9d3a42dd998c7f7837157ef18699ba445ec1 100644
index d8666481f9a407403d0114ff02024fd3c50c27c4..a1374b608c20d47fde15135089bf8aceb98d6129 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2370,4 +2370,15 @@ public final class Bukkit {
@@ -2368,4 +2368,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 5dc245bfbc1d466ab96294bbc10ead1fcec4f841..010f9d3a42dd998c7f7837157ef18699
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3fe569f79ee2f408553bfda0340b1d96a47dd770..8357f802f60f146cbc08ea7991a3b3a24d8bc233 100644
index 541da7064f5bd563cde8475be6bc47c82d9cd22b..027e0141995ce8edc11ae0ab3c589ad6ac00b43c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2072,4 +2072,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2070,4 +2070,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end