tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge back the network fixes

Browse source
This commit is contained in:
Aidan C. Brady 2014-08-09 13:43:59 -04:00
parent a3c6b9dac2
commit 98ee002472
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/mekanism/api/gas/GasNetwork.java
View file

@ -6,6 +6,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import mekanism.api.Coord4D;
@ -279,7 +280,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
Gas type = (Gas)data[0];
Set<IGasHandler> toReturn = new HashSet<IGasHandler>();
for(IGasHandler acceptor : possibleAcceptors.values())
for(IGasHandler acceptor : ((Map<Coord4D, IGasHandler>)possibleAcceptors.clone()).values())
{
if(acceptorDirections.get(acceptor) == null)
{

3
src/main/java/mekanism/common/EnergyNetwork.java
View file

@ -9,6 +9,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import mekanism.api.Coord4D;
@ -233,7 +234,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
return toReturn;
}
for(TileEntity acceptor : possibleAcceptors.values())
for(TileEntity acceptor : ((Map<Coord4D, TileEntity>)possibleAcceptors.clone()).values())
{
ForgeDirection side = acceptorDirections.get(acceptor);

3
src/main/java/mekanism/common/FluidNetwork.java
View file

@ -6,6 +6,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import mekanism.api.Coord4D;
@ -291,7 +292,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
FluidStack fluidToSend = (FluidStack)data[0];
Set<IFluidHandler> toReturn = new HashSet<IFluidHandler>();
for(IFluidHandler acceptor : possibleAcceptors.values())
for(IFluidHandler acceptor : ((Map<Coord4D, IFluidHandler>)possibleAcceptors.clone()).values())
{
if(acceptorDirections.get(acceptor) == null)
{

1
src/main/java/mekanism/common/Mekanism.java
View file

@ -1088,6 +1088,7 @@ public class Mekanism
OreDictionary.registerOre("universalCable", new ItemStack(PartTransmitter, 8, 0));
OreDictionary.registerOre("battery", EnergyTablet.getUnchargedItem());
OreDictionary.registerOre("pulpWood", Sawdust);
OreDictionary.registerOre("dustWood", Sawdust);
OreDictionary.registerOre("blockSalt", SaltBlock);
//Alloys!