Merge branch 'nightly' into marmot

This commit is contained in:
CovertJaguar 2014-01-03 01:19:52 -08:00
commit ee71e86409

View file

@ -334,12 +334,6 @@ public class TileFiller extends TileBuildCraft implements IInventory, IPowerRece
@Override
public void readGuiData(DataInputStream data, EntityPlayer player) throws IOException {
IFillerPattern prev = currentPattern;
currentPattern = FillerManager.registry.getPattern(data.readUTF());
if (currentPattern == null)
currentPattern = PatternFill.INSTANCE;
if (prev != currentPattern)
done = false;
sendNetworkUpdate();
setPattern(FillerManager.registry.getPattern(data.readUTF()));
}
}