fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a crash when dealing with large ore dictionary registrations.

Browse Source
This commit is contained in:
AlgorithmX2
2014-08-11 22:56:57 -05:00
parent feb7d7be95
commit f3a9a12e04
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/item/OreHelper.java
+3 -11
View File
@@ -68,7 +68,6 @@ public class OreHelper
OreRefrence ref = new OreRefrence();
Collection<Integer> ores = ref.getOres();
Collection<ItemStack> set = ref.getEquivilients();
Collection<IAEItemStack> aeset = ref.getAEEquivilients();
for (String ore : OreDictionary.getOreNames())
{
@@ -93,14 +92,7 @@ public class OreHelper
}
if ( !set.isEmpty() )
{
or.oreValue = ref;
// SUMMON AE STACKS!
for (ItemStack is : set)
if ( is.getItem() != null )
aeset.add( AEItemStack.create( is ) );
}
}
return or.oreValue;
@@ -118,7 +110,7 @@ public class OreHelper
return false;
Collection<Integer> bOres = b.getOres();
for (Integer ore : a.ores)
for (Integer ore : a.getOres())
{
if ( bOres.contains( ore ) )
return true;
@@ -134,9 +126,9 @@ public class OreHelper
if ( a == b )
return true;
Collection<Integer> bOres = b.getOres();
for (Integer ore : a.ores)
for (Integer ore : a.getOres())
{
if ( bOres.contains( ore ) )
return true;