mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3fd1502 Add missing deprecation (#8886) PaperMC/Paper@773dd72 Updated Upstream (Bukkit/CraftBukkit) (#9739)
This commit is contained in:
@@ -25,10 +25,10 @@ index 1265167bc9167cb586b98391ea3daaa09fa4e7fb..287f5b64622cdc98cbe8248c89af27c9
|
||||
}
|
||||
// Spigot end
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 6eb6c98492667192224dfe6981a2353fe7210a46..936c47a174f434feecbf76a6454d6199515d4d88 100644
|
||||
index 139ff6af8134dd26b0ee40fa3d62a00f55e41694..98c4b8356dc26cf220dddb5ec319751b81601991 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -3149,5 +3149,10 @@ public final class CraftServer implements Server {
|
||||
@@ -3151,5 +3151,10 @@ public final class CraftServer implements Server {
|
||||
public String getServerName() {
|
||||
return this.getProperties().serverName;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user