Merge branch 'master' into pre/1.13

* master:
  Fix logic bug in negative XP bug fix - Closes #1169
This commit is contained in:
Aikar
2018-08-03 21:20:57 -04:00
9 changed files with 15 additions and 14 deletions

View File

@@ -8,7 +8,7 @@ which can keep them in the chunk when they shouldnt be if done
during entity ticking.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index eb56940a18..7f999cbd5b 100644
index 0f2dadfa39..f6531d4fea 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose