Merge branch 'master' into ver/1.14

This commit is contained in:
Shane Freeder
2019-05-27 01:16:47 +01:00
14 changed files with 15 additions and 46 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
Fires event at start and end of a server tick
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e160e72cd..13278cc58 100644
index 99306781f7..cbb4280631 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