From c80433aaf440e45da0d7c3927c9d9da5118a7dd6 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 27 Feb 2017 19:38:48 +0100
Subject: [PATCH] Fix dig times of wool and cobweb

---
 mods/CORE/mcl_autogroup/init.lua | 17 +++++++----------
 mods/ITEMS/mcl_core/nodes.lua    |  2 +-
 mods/ITEMS/mcl_wool/init.lua     |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/mods/CORE/mcl_autogroup/init.lua b/mods/CORE/mcl_autogroup/init.lua
index 7ca647bd3..63743f37f 100644
--- a/mods/CORE/mcl_autogroup/init.lua
+++ b/mods/CORE/mcl_autogroup/init.lua
@@ -125,18 +125,15 @@ local overwrite = function()
 					if ar == nil then
 						ar = 0
 					end
-					if minigroup == "handy" then
+					if (minigroup == "handy")
+							or
+							(ndef.groups.shearsy_wool and minigroup == "shearsy_wool" and ndef.groups.wool)
+							or
+							(ndef.groups.swordy_cobweb and minigroup == "swordy_cobweb" and nname == "mcl_core:cobweb")
+							or
+							(ndef.groups[minigroup] and minigroup ~= "swordy_cobweb" and minigroup ~= "shearsy_wool") then
 						newgroups = calculate_group(hardness, minigroup, diggroup, newgroups, ar, 1)
 						groups_changed = true
-					elseif ndef.groups[minigroup] then
-						if (minigroup == "shearsy_wool" and ndef.groups.wool) or
-						(minigroup == "swordy_cobweb" and nname == "mcl_core:cobweb") then
-							newgroups = calculate_group(hardness, minigroup, diggroup, newgroups, ar, 1)
-							groups_changed = true
-						elseif minigroup ~= "swordy_cobweb" and minigroup ~= "shearsy_wool" then
-							newgroups = calculate_group(hardness, minigroup, diggroup, newgroups, ar, 1)
-							groups_changed = true
-						end
 					end
 				end
 			end
diff --git a/mods/ITEMS/mcl_core/nodes.lua b/mods/ITEMS/mcl_core/nodes.lua
index 0c6b36745..e3f45f4d1 100644
--- a/mods/ITEMS/mcl_core/nodes.lua
+++ b/mods/ITEMS/mcl_core/nodes.lua
@@ -1662,7 +1662,7 @@ minetest.register_node("mcl_core:cobweb", {
        liquid_renewable = false,
        liquid_range = 0,
        walkable = false,
-       groups = {swordy=1,shearsy=1, deco_block=1},
+       groups = {swordy_cobweb=1,shearsy=1, deco_block=1},
        drop = "mcl_mobitems:string",
 	_mcl_blast_resistance = 20,
 	_mcl_hardness = 4,
diff --git a/mods/ITEMS/mcl_wool/init.lua b/mods/ITEMS/mcl_wool/init.lua
index 31c675840..274c617ef 100644
--- a/mods/ITEMS/mcl_wool/init.lua
+++ b/mods/ITEMS/mcl_wool/init.lua
@@ -38,7 +38,7 @@ for _, row in ipairs(wool.dyes) do
 			stack_max = 64,
 			is_ground_content = false,
 			tiles = {"wool_"..texture..".png"},
-			groups = {handy=1,shearsy=1, flammable=1,wool=1,building_block=1},
+			groups = {handy=1,shearsy_wool=1, flammable=1,wool=1,building_block=1},
 			sounds = mcl_sounds.node_sound_defaults(),
 			_mcl_hardness = 0.8,
 			_mcl_blast_resistance = 4,