diff --git a/lang b/lang index 4f2d22adf..fc7d797db 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 4f2d22adf5aff4267f60d4e0ecf3984c35fb22f0 +Subproject commit fc7d797dbaee82ce9faa3b10941fdfb5813bfd07 diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index fa6d53986..51a47fceb 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -23,6 +23,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.apiculture.genetics.BeeGenome; +import forestry.apiculture.genetics.DefaultBeeModelProvider; import forestry.core.config.Config; import forestry.core.genetics.ItemGE; import forestry.core.items.IColoredItem; @@ -144,6 +145,9 @@ public class ItemBeeGE extends ItemGE implements IColoredItem { private class BeeMeshDefinition implements ItemMeshDefinition { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { + if (!stack.hasTagCompound()) { // villager trade wildcard bees + return DefaultBeeModelProvider.instance.getModel(type); + } IAlleleBeeSpecies species = (IAlleleBeeSpecies) getSpecies(stack); return species.getModel(type); } diff --git a/src/main/java/forestry/core/genetics/ItemGE.java b/src/main/java/forestry/core/genetics/ItemGE.java index 2f5a6bb79..3e9bf0ab0 100755 --- a/src/main/java/forestry/core/genetics/ItemGE.java +++ b/src/main/java/forestry/core/genetics/ItemGE.java @@ -51,6 +51,9 @@ public abstract class ItemGE extends ItemForestry { @Override public boolean hasEffect(ItemStack stack) { + if (!stack.hasTagCompound()) { // villager trade wildcard bees + return false; + } IAlleleSpecies species = getSpecies(stack); return species.hasEffect(); }