Fix merge conflicts from access transform update.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user