Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

Hopefully fixed a Miner Bug

Browse source
This commit is contained in:
canitzp 2016-02-18 18:43:35 +01:00
parent 57c37cb900
commit 8be363ba08
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java
View file

@ -126,29 +126,32 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR
} }
private boolean isMinable(Block block, int meta){ private boolean isMinable(Block block, int meta){
if(!this.isBlacklisted(block)){ if(block != null){
if(!this.onlyMineOres){ if(!this.isBlacklisted(block)){
return true; if(!this.onlyMineOres){
} return true;
else{
int[] ids = OreDictionary.getOreIDs(new ItemStack(block, 1, meta));
for(int id : ids){
String name = OreDictionary.getOreName(id);
if(name.startsWith("ore") || name.startsWith("denseore")){
return true;
}
} }
else{
String reg = block.getRegistryName(); int[] ids = OreDictionary.getOreIDs(new ItemStack(block, 1, meta));
if(reg != null && !reg.isEmpty()){ for(int id : ids){
for(String string : ConfigValues.minerExtraWhitelist){ String name = OreDictionary.getOreName(id);
if(reg.equals(string)){ if(name.startsWith("ore") || name.startsWith("denseore")){
return true; return true;
} }
} }
String reg = block.getRegistryName();
if(reg != null && !reg.isEmpty()){
for(String string : ConfigValues.minerExtraWhitelist){
if(reg.equals(string)){
return true;
}
}
}
} }
} }
} }
return false; return false;
} }