Updated Upstream (Paper)

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

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 010f9d3a42dd998c7f7837157ef18699ba445ec1..a5eb36738e6cbb55dc3a28467b062f014395e013 100644
index a1374b608c20d47fde15135089bf8aceb98d6129..e7bca7fc74a6a2914c966183c9f83340dd510bf0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2380,5 +2380,14 @@ public final class Bukkit {
@@ -2378,5 +2378,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 010f9d3a42dd998c7f7837157ef18699ba445ec1..a5eb36738e6cbb55dc3a28467b062f01
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8357f802f60f146cbc08ea7991a3b3a24d8bc233..dbca73bfab240b5d207e9904b69be1481096f874 100644
index 027e0141995ce8edc11ae0ab3c589ad6ac00b43c..d723e5503ddface53f670ac4e2dac2aa250f68b5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2080,5 +2080,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2078,5 +2078,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();