Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-22 16:49:28 +00:00
commit 622985f3fb
18 files changed
+415 -75

No files matched your search

@@ -404,14 +404,14 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
}
}
List<Integer> idsFound = new ArrayList<Integer>();
int idToUse = -1;
List<String> idsFound = new ArrayList<String>();
String idToUse = null;
for(Coord4D obj : structureFound.locations)
{
TileEntityMultiblock<T> tileEntity = (TileEntityMultiblock<T>)obj.getTileEntity(pointer.getWorldObj());
if(tileEntity.cachedID != -1)
if(tileEntity.cachedID != null)
{
idsFound.add(tileEntity.cachedID);
}
@@ -422,7 +422,7 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
if(!idsFound.isEmpty())
{
for(int id : idsFound)
for(String id : idsFound)
{
if(getManager().inventories.get(id) != null)
{