From 6dbce3337395906663145c975728a335a7a14039 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Thu, 12 Jan 2017 07:13:58 +0100
Subject: [PATCH] Fix cactus definition

---
 mods/default/functions.lua | 2 +-
 mods/default/nodes.lua     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index bfce01efd2..f3e2911e96 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -66,7 +66,7 @@ grow_cactus = function(pos, node)
 			height = height+1
 			pos.y = pos.y+1
 		end
-		if height < 4 then
+		if height < 3 then
 			if minetest.get_node(pos).name == "air" then
 				minetest.set_node(pos, {name="default:cactus"})
 			end
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 5472227004..776dbaff2c 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -882,7 +882,7 @@ minetest.register_node("default:cactus", {
 	tiles = {"default_cactus_top.png", "default_cactus_bottom.png", "default_cactus_side.png","default_cactus_side.png","default_cactus_side.png","default_cactus_side.png"},
 	is_ground_content = true,
 	stack_max = 64,
-	groups = {snappy=1,choppy=3,flammable=2},
+	groups = {oddly_breakable_by_hand=2,},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype = "light",
 	node_box = {