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

@@ -64,7 +64,7 @@ index 53c9f21887..71e4084320 100644
return this.a.a();
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6f063dc935..94a4bf3c7a 100644
index 6ed5cbb096..3c9d9f1ab0 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