Implement NSA-Mandated Spyware

Paper Changes:
PaperMC/Paper@956062a Add transient modifiers (#9244)
PaperMC/Paper@d8e0759 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@14cfd64 Schedule several things for removal in 1.21 (#9041)
PaperMC/Paper@175a774 [ci skip] Use a separate interface for bootstrapping (#9267)
PaperMC/Paper@bc4a664 Paper Plugins Dependency Format Update (#9160)

Pufferfish Changes:
pufferfish-gg/Pufferfish@cadfa71 Fix config bugs
This commit is contained in:
Ben Kerllenevich
2023-06-07 13:02:26 -04:00
parent f4296d6226
commit ead09e2bf6
25 changed files with 80 additions and 80 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 15a4a8d2e6205f4d25f4dcc5218281197cd42732..a2ee324d32c48fa9d71768f9b1cf7efcae02a01d 100644
index f30ddfb1a5800542d456597b93d4ee66c7f1d2ee..e71744ac7b773cc9cd46fd82566782f7d204f5d6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2470,5 +2470,14 @@ public final class Bukkit {
@@ -2493,5 +2493,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 15a4a8d2e6205f4d25f4dcc5218281197cd42732..a2ee324d32c48fa9d71768f9b1cf7efc
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index bb2524790008e3b90b16977076d9bb4c8b1461ba..d16c5f0bd920291311ccf9870463aaaa98661578 100644
index 4dcfe692385cdeb75309bdff4bd90fa6036b36c2..d547a53c55b446b8c3389695123009f8a1d91192 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2155,5 +2155,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2182,5 +2182,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();