From 2f5cbb7d3cd686d62602b83a8119defb21bc292e Mon Sep 17 00:00:00 2001 From: marcin212 Date: Tue, 30 Sep 2014 17:15:19 +0200 Subject: [PATCH] Fixed issue #23 Infernal Hive not spawning (+1 squashed commits) Squashed commits: [ca7be80] probably fix #21 #20 #17. --- .../java/magicbees/storage/BackpackDefinition.java | 10 +++++++++- src/main/java/magicbees/world/feature/FeatureHive.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/storage/BackpackDefinition.java b/src/main/java/magicbees/storage/BackpackDefinition.java index 9fc3c74..256d22e 100644 --- a/src/main/java/magicbees/storage/BackpackDefinition.java +++ b/src/main/java/magicbees/storage/BackpackDefinition.java @@ -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; @@ -35,7 +36,7 @@ public class BackpackDefinition implements IBackpackDefinition @Override public String getName(ItemStack backpack) { - return backpack.getDisplayName(); + return name; } @Override @@ -78,4 +79,11 @@ public class BackpackDefinition implements IBackpackDefinition return flag; } + @Override + public void addValidItems(List validItems) { + for(ItemStack s : validItems) + addValidItem(s); + + } + } diff --git a/src/main/java/magicbees/world/feature/FeatureHive.java b/src/main/java/magicbees/world/feature/FeatureHive.java index bea7c7d..791ae78 100644 --- a/src/main/java/magicbees/world/feature/FeatureHive.java +++ b/src/main/java/magicbees/world/feature/FeatureHive.java @@ -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)) {