Fix merge conflicts from access transform update.

This commit is contained in:
md_5
2015-06-06 19:47:02 +10:00
parent 0f48b03bbc
commit 7e51dc4e18
3 changed files with 8 additions and 8 deletions

View File

@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public final int locZ;
private boolean k;
public final Map<BlockPosition, TileEntity> tileEntities;
- public final EntitySlice<Entity>[] entitySlices; // CraftBukkit - public
- public final EntitySlice<Entity>[] entitySlices;
+ public final List<Entity>[] entitySlices; // Spigot
private boolean done;
private boolean lit;