From 57ca92e0eb880ae456df4a2617d4062bd34507c5 Mon Sep 17 00:00:00 2001
From: Erich Schubert <kno10@users.noreply.github.com>
Date: Fri, 4 Oct 2024 10:42:25 +0200
Subject: [PATCH] Simplify minetest.strip_param2_color

---
 builtin/common/item_s.lua | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/builtin/common/item_s.lua b/builtin/common/item_s.lua
index 72a722ed1..673c83877 100644
--- a/builtin/common/item_s.lua
+++ b/builtin/common/item_s.lua
@@ -166,20 +166,19 @@ function core.is_colored_paramtype(ptype)
 end
 
 function core.strip_param2_color(param2, paramtype2)
-	if not core.is_colored_paramtype(paramtype2) then
+	if paramtype2 == "color" then
+		return param2
+	elseif paramtype2 == "colorfacedir" then
+		return math.floor(param2 / 32) * 32
+	elseif paramtype2 == "color4dir" then
+		return math.floor(param2 / 4) * 4
+	elseif paramtype2 == "colorwallmounted" then
+		return math.floor(param2 / 8) * 8
+	elseif paramtype2 == "colordegrotate" then
+		return math.floor(param2 / 32) * 32
+	else
 		return nil
 	end
-	if paramtype2 == "colorfacedir" then
-		param2 = math.floor(param2 / 32) * 32
-	elseif paramtype2 == "color4dir" then
-		param2 = math.floor(param2 / 4) * 4
-	elseif paramtype2 == "colorwallmounted" then
-		param2 = math.floor(param2 / 8) * 8
-	elseif paramtype2 == "colordegrotate" then
-		param2 = math.floor(param2 / 32) * 32
-	end
-	-- paramtype2 == "color" requires no modification.
-	return param2
 end
 
 -- Content ID caching