Beds: Strip colour bits from param2 in 'get look yaw'

Based on code by github user 'hdak1945git'. Fixes a crash when 'colorfacedir' param2 is used for beds.
minetest · Sep 28, 2017 · 809e5933c4bf1dd8bd8e72604948a1ca6a9cd2a3 · 809e593
1 parent 2d8207a
commit 809e5933c4bf1dd8bd8e72604948a1ca6a9cd2a3
Unified Split

Showing with 11 additions and 8 deletions.

+11 −8 mods/beds/functions.lua
diff --git a/mods/beds/functions.lua b/mods/beds/functions.lua
@@ -9,15 +9,18 @@ end
 -- Helper functions
 local function get_look_yaw(pos)
-  
-	local n = minetest.get_node(pos)
-  
-	if n.param2 == 1 then
-  
-		return pi / 2, n.param2
-  
-	elseif n.param2 == 3 then
-  
-		return -pi / 2, n.param2
-  
-	elseif n.param2 == 0 then
-  
-		return pi, n.param2
+  
+	local rotation = minetest.get_node(pos).param2
+  
+	if rotation > 3 then
+  
+		rotation = rotation % 4 -- Mask colorfacedir values
+  
+	end
+  
+	if rotation == 1 then
+  
+		return pi / 2, rotation
+  
+	elseif rotation == 3 then
+  
+		return -pi / 2, rotation
+  
+	elseif rotation == 0 then
+  
+		return pi, rotation
 	else
-  
-		return 0, n.param2
+  
+		return 0, rotation
 	end
 end