mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
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:
@@ -25,10 +25,10 @@ index 57f6de7872bfa80cf7668524975946cbd7fcda56..6cdcd4f105b15f10d60499572f6f4f83
|
||||
}
|
||||
// Spigot end
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index c4c0cfa2530bab3d898603f2335ffe92460431b6..5805da6b1322d6be5067aeab91be90c02997f7c8 100644
|
||||
index 7bd2b6a0049d008e3702f1bcd06b760b6681b9cb..32da3d33dec77608e23a38a60669d08b39bfb892 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2982,5 +2982,10 @@ public final class CraftServer implements Server {
|
||||
@@ -3002,5 +3002,10 @@ public final class CraftServer implements Server {
|
||||
public String getServerName() {
|
||||
return this.getProperties().serverName;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user