Merged in marcin212/magic-bees (pull request #3)

probably fix: #21 #20 #17.
This commit is contained in:
Arkandos committed 2014-10-18 17:03:37 +02:00
commit 6ff6b72580
2 files changed
+9 -1

No files matched your search

@@ -2,6 +2,7 @@ package magicbees.storage;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -78,4 +79,11 @@ public class BackpackDefinition implements IBackpackDefinition
return flag;
}
@Override
public void addValidItems(List<ItemStack> validItems) {
for(ItemStack s : validItems)
addValidItem(s);
}
}
@@ -137,7 +137,7 @@ public class FeatureHive
int chop = random.nextInt(2) + 1;
int coordY = random.nextInt(60 / chop) + random.nextInt(chop) * (120 / chop) - 5;
if(world.isAirBlock(coordX, coordY, coordZ) && world.getBlock(coordX, coordY, coordZ) != null &&
if(!world.isAirBlock(coordX, coordY, coordZ) && world.getBlock(coordX, coordY, coordZ) != null &&
world.getBlock(coordX, coordY, coordZ).isReplaceableOreGen(world, coordX, coordY, coordZ,
Blocks.netherrack))
{