mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c029645 Don't allow world unloading while ticking worlds (fixes #8080) (#8081) PaperMC/Paper@9d0650e Don't print component in resource pack rejection message (#8084)
This commit is contained in:
@@ -25,10 +25,10 @@ index 781da79fb246b8d4263ede4d8d5cc22090d9e4ba..6f7326c26e900a96ab119e5ee0f06991
|
||||
}
|
||||
// Spigot end
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 5fcd5c23755773613ca7a2926a60327d36c08b51..50be028e6f14edbc0aef70a2ed33fa1cb9221101 100644
|
||||
index 317ec55ac02deb9e88fa658f2eaa150409c12127..2dc8d141f20787981ede3a27b5683408142a7c1f 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2917,5 +2917,10 @@ public final class CraftServer implements Server {
|
||||
@@ -2918,5 +2918,10 @@ public final class CraftServer implements Server {
|
||||
public String getServerName() {
|
||||
return this.getProperties().serverName;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user