Fix crash planting crops in large pot without a substrate

jaquadro · Aug 23, 2014 · 2c75437 · 2c75437
1 parent dc37088
commit 2c75437
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Build/build.gradle b/Build/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.2.0"
+version = "1.7.10-1.2.1"
 group= "com.jaquadro.gardenstuff" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "GardenStuff"
 

diff --git a/GardenContainers/build.gradle b/GardenContainers/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.2.0"
+version = "1.7.10-1.2.1"
 group= "com.jaquadro.gardencontainers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "GardenContainers"
 

diff --git a/GardenContainers/resources/mcmod.info b/GardenContainers/resources/mcmod.info
@@ -3,7 +3,7 @@
 	"modid": "GardenContainers",
 	"name": "Garden Containers",
 	"description": "A variety of containers for planting vegetation.",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"credits": "By jaquadro",
 	"logoFile": "",
 	"url": "http://www.jaquadro.com/",

diff --git a/GardenContainers/src/com/jaquadro/minecraft/gardencontainers/GardenContainers.java b/GardenContainers/src/com/jaquadro/minecraft/gardencontainers/GardenContainers.java
@@ -24,7 +24,7 @@ public class GardenContainers
 {
     public static final String MOD_ID = "GardenContainers";
     public static final String MOD_NAME = "Garden Containers";
-    public static final String MOD_VERSION = "1.2.0";
+    public static final String MOD_VERSION = "1.2.1";
     static final String SOURCE_PATH = "com.jaquadro.minecraft.gardencontainers.";
 
     public static final ModBlocks blocks = new ModBlocks();

diff --git a/GardenContainers/src/com/jaquadro/minecraft/gardencontainers/block/BlockLargePot.java b/GardenContainers/src/com/jaquadro/minecraft/gardencontainers/block/BlockLargePot.java
@@ -281,7 +281,7 @@ public boolean canSustainPlant (IBlockAccess world, int x, int y, int z, ForgeDi
     }
 
     protected boolean substrateSupportsCrops (ItemStack substrate) {
-        if (substrate.getItem() == null)
+        if (substrate == null || substrate.getItem() == null)
             return false;
 
         if (Block.getBlockFromItem(substrate.getItem()) == ModBlocks.gardenFarmland)