Merge remote-tracking branch 'origin/mc1.10' into mc1.10

This commit is contained in:
Raoul Van den Berge
2016-09-26 19:37:35 +02:00

View File

@@ -379,7 +379,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
if (disk != null) { if (disk != null) {
int i = 6; int i = 6;
while (disks.getStackInSlot(i) != null && i < 12) { while (i < 12 && disks.getStackInSlot(i) != null) {
i++; i++;
} }