Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-30 00:47:54 +00:00
commit 62e7cc8f65
54 files changed
+992 -344

No files matched your search

@@ -475,11 +475,11 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
//TODO perhaps drop from pointer?
cache.apply((T)structureFound);
onFormed();
structureFound.inventoryID = idToUse;
onFormed();
List<IStructuralMultiblock> structures = new ArrayList<IStructuralMultiblock>();
Coord4D toUse = null;