mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'v9' into 1.8.9
This commit is contained in:
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)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user