Merge branch 'master' into pre/1.13

* master:
  Fix some false positive warnings printing that shouldnt be
This commit is contained in:
Aikar
2018-08-20 20:23:06 -04:00
3 changed files with 9 additions and 8 deletions

View File

@@ -14,7 +14,7 @@ Fix this by differing entity add to world for all entities at the same time
the original entity is dead, overwrite it as the logic does for unloaod queued entities.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 17f19219f2..bb193966b8 100644
index bd31a7dcab..8b80830933 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {