mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.8.9
This commit is contained in:
commit
0cb18773aa
1288 files changed
+11316
-7212
No files matched your search
@@ -7,6 +7,7 @@ import java.util.ArrayList;
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.Range4D;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.multiblock.IMultiblock;
|
||||
import mekanism.common.multiblock.MultiblockCache;
|
||||
import mekanism.common.multiblock.MultiblockManager;
|
||||
@@ -192,6 +193,7 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
|
||||
data.add(getSynchronizedData().volLength);
|
||||
|
||||
getSynchronizedData().renderLocation.write(data);
|
||||
data.add(getSynchronizedData().inventoryID);
|
||||
}
|
||||
else {
|
||||
data.add(false);
|
||||
@@ -223,6 +225,7 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
|
||||
getSynchronizedData().volLength = dataStream.readInt();
|
||||
|
||||
getSynchronizedData().renderLocation = Coord4D.read(dataStream);
|
||||
getSynchronizedData().inventoryID = PacketHandler.readString(dataStream);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user