Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: bc17ce69d Delay unsafe actions until after entity ticking is done - Fixes #3114 5553e6b3e Disable Sync Events firing Async errors during shutdown e12c51d9b Use better variable for isStopping() API 586ee2bb1 Remove patch for MC-111480, fixed in 1.14 09a942155 Remove streams from Mob AI System bb5c294ec Fix Disabling Asynchronous Chunks 089d83568 Implement Chunk Priority / Urgency System for World Gen fce69af70 Use dedicated thread for main thread blocking chunk loads 588b62e47 Add tick times API and /mspt command (#3102) 11de41c77 Add API MinecraftServer#isStopping (#3129) 942ff3c28 My patches are under MIT (#3130)
This commit is contained in:
@@ -228,7 +228,7 @@ index ef632a5f9cb480e77026f2f1123f76896f12478c..9708d61fd3795e8b69f27ecea92abe00
|
||||
this.world = new CraftWorld((WorldServer) this, gen, env);
|
||||
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index b03443f9a72a3c455f49746fea2f555c2f53e504..dbee3bed7ae77fed33fe53cdb24ef5c5aeffbf7c 100644
|
||||
index b381514d9ff59ddff515930e2e41e529c42ea206..765b865b85ba39d6446cfde4fd838d6b72bcfcdd 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -806,6 +806,7 @@ public final class CraftServer implements Server {
|
||||
@@ -247,7 +247,7 @@ index b03443f9a72a3c455f49746fea2f555c2f53e504..dbee3bed7ae77fed33fe53cdb24ef5c5
|
||||
}
|
||||
|
||||
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
||||
@@ -2082,6 +2084,14 @@ public final class CraftServer implements Server {
|
||||
@@ -2092,6 +2094,14 @@ public final class CraftServer implements Server {
|
||||
return com.destroystokyo.paper.PaperConfig.config;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user