tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Browse source
This commit is contained in:
AlgorithmX2 2014-06-17 23:36:53 -05:00
commit 0a18f2d926
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/Registration.java
View file

@ -664,13 +664,20 @@ public class Registration
private void registerSpatial(boolean force)
{
if ( ! AEConfig.instance.isFeatureEnabled( AEFeature.SpatialIO ) )
return;
AEConfig config = AEConfig.instance;
if ( storageBiome == null )
{
if ( force && config.storageBiomeID == -1 )
{
storageBiome = new BiomeGenStorage( config.storageBiomeID = Platform.findEmpty( BiomeGenBase.getBiomeGenArray() ) );
config.storageBiomeID = Platform.findEmpty( BiomeGenBase.getBiomeGenArray() );
if ( config.storageBiomeID == -1 )
throw new RuntimeException("Biome Array is full, please free up some Biome ID's or disable spatial.");
storageBiome = new BiomeGenStorage( config.storageBiomeID );
config.save();
}

8
tile/storage/TileIOPort.java
View file

@ -379,8 +379,12 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
src.injectItems( failed, Actionable.MODULATE, mySrc );
}
itemsToMove -= possible;
didStuff = true;
if ( possible > 0 )
{
itemsToMove -= possible;
didStuff = true;
}
break;
}
}