add minimum binnie version, add workaround for a bug (#2326)

ForestryMC · Dec 28, 2018 · 500632e · 500632e
1 parent f7439d2
commit 500632e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java
@@ -79,7 +79,8 @@
 		+ "after:" + PluginNatura.MOD_ID + ";"
 		+ "after:toughasnails;"
 		+ "after:" + PluginTechReborn.MOD_ID + ";"
-		+ "after:" + PluginBuildCraftFuels.MOD_ID + ";")
+		+ "after:" + PluginBuildCraftFuels.MOD_ID + ";"
+		+ "before:binniecore@[2.5.1.184,)")
 public class Forestry {
 
 	@SuppressWarnings("NullableProblems")

diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java
@@ -145,10 +145,11 @@ public void onBlockTick(World worldIn, BlockPos pos, IBlockState state, Random r
 
 		if (!checkedForConversionToDefaultLeaves) {
 			if (shouldConvertToDefaultLeaves()) {
-				IBlockState defaultLeaves;
+				IBlockState defaultLeaves = null;
 				if (isFruitLeaf) {
 					defaultLeaves = ModuleArboriculture.getBlocks().getDefaultLeavesFruit(primary.getUID());
-				} else {
+				}
+				if(defaultLeaves == null) {
 					defaultLeaves = ModuleArboriculture.getBlocks().getDefaultLeaves(primary.getUID());
 				}
 				worldIn.setBlockState(getPos(), defaultLeaves);
@@ -318,8 +319,8 @@ public boolean canMateWith(IIndividual individual) {
 		if (individual instanceof ITree) {
 			ITree tree = getTree();
 			return tree != null &&
-				tree.getMate() == null &&
-				(ModuleApiculture.doSelfPollination || !tree.isGeneticEqual(individual));
+					tree.getMate() == null &&
+					(ModuleApiculture.doSelfPollination || !tree.isGeneticEqual(individual));
 		}
 		return false;
 	}