From: sfan5 <sfan5@live.de>
Date: Tue, 30 Jul 2019 15:18:37 +0000 (+0200)
Subject: Allow toolcaps to override the built-in times for dig_immediate
X-Git-Tag: 5.1.0~149
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3296952ae55231d601686b69c037ec1366381fc5;p=oweals%2Fminetest.git

Allow toolcaps to override the built-in times for dig_immediate
---

diff --git a/src/tool.cpp b/src/tool.cpp
index becb574b0..09b876ae0 100644
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -172,14 +172,16 @@ void ToolCapabilities::deserializeJson(std::istream &is)
 DigParams getDigParams(const ItemGroupList &groups,
 		const ToolCapabilities *tp)
 {
-	// Group dig_immediate has fixed time and no wear
-	switch (itemgroup_get(groups, "dig_immediate")) {
-	case 2:
-		return DigParams(true, 0.5, 0, "dig_immediate");
-	case 3:
-		return DigParams(true, 0, 0, "dig_immediate");
-	default:
-		break;
+	// Group dig_immediate defaults to fixed time and no wear
+	if (tp->groupcaps.find("dig_immediate") == tp->groupcaps.cend()) {
+		switch (itemgroup_get(groups, "dig_immediate")) {
+		case 2:
+			return DigParams(true, 0.5, 0, "dig_immediate");
+		case 3:
+			return DigParams(true, 0, 0, "dig_immediate");
+		default:
+			break;
+		}
 	}
 
 	// Values to be returned (with a bit of conversion)