SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ver/1.14

Browse Source
This commit is contained in:
Shane Freeder
2019-05-27 01:16:47 +01:00
parent db3bafc4d1 3e0027e482
commit 70e671043a
14 changed files with 15 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
View File

@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
synchronously when the server gets shut down.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ef850c17e0..934f9f7f07 100644
index ba68d7f833..f1cd38d421 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas