From 49670d1d2802972c3d49936aa0b9698bca286ca5 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Thu, 10 Nov 2022 23:55:40 +0100
Subject: [PATCH] put water flow code in separate function

---
 mods/ENTITIES/mcl_mobs/api.lua     | 39 +----------------------------
 mods/ENTITIES/mcl_mobs/physics.lua | 40 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua
index 07fd34e2c..9f9c719df 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@@ -685,44 +685,7 @@ function mob_class:on_step(dtime)
 			self:check_herd(dtime)
 		end
 	end
-
-	-- Add water flowing for mobs from mcl_item_entity
-		local p, node, nn, def
-		p = self.object:get_pos()
-		node = minetest.get_node_or_nil(p)
-		if node then
-			nn = node.name
-			def = minetest.registered_nodes[nn]
-		end
-
-		-- Move item around on flowing liquids
-		if def and def.liquidtype == "flowing" then
-
-			--[[ Get flowing direction (function call from flowlib), if there's a liquid.
-			NOTE: According to Qwertymine, flowlib.quickflow is only reliable for liquids with a flowing distance of 7.
-			Luckily, this is exactly what we need if we only care about water, which has this flowing distance. ]]
-			local vec = flowlib.quick_flow(p, node)
-			-- Just to make sure we don't manipulate the speed for no reason
-			if vec.x ~= 0 or vec.y ~= 0 or vec.z ~= 0 then
-				-- Minecraft Wiki: Flowing speed is "about 1.39 meters per second"
-				local f = 1.39
-				-- Set new item moving speed into the direciton of the liquid
-				local newv = vector.multiply(vec, f)
-				self.object:set_acceleration({x = 0, y = 0, z = 0})
-				self.object:set_velocity({x = newv.x, y = -0.22, z = newv.z})
-
-				self.physical_state = true
-				self._flowing = true
-				self.object:set_properties({
-					physical = true
-				})
-				return
-			end
-		elseif self._flowing == true then
-			-- Disable flowing physics if not on/in flowing liquid
-			self._flowing = false
-			return
-		end
+	self:check_water_flow()
 
 	if self:is_at_cliff_or_danger() then
 			self:set_velocity(0)
diff --git a/mods/ENTITIES/mcl_mobs/physics.lua b/mods/ENTITIES/mcl_mobs/physics.lua
index bb7143ceb..b982e14a4 100644
--- a/mods/ENTITIES/mcl_mobs/physics.lua
+++ b/mods/ENTITIES/mcl_mobs/physics.lua
@@ -884,3 +884,43 @@ function mob_class:falling(pos)
 		end
 	end
 end
+
+function mob_class:check_water_flow()
+	-- Add water flowing for mobs from mcl_item_entity
+	local p, node, nn, def
+	p = self.object:get_pos()
+	node = minetest.get_node_or_nil(p)
+	if node then
+		nn = node.name
+		def = minetest.registered_nodes[nn]
+	end
+
+	-- Move item around on flowing liquids
+	if def and def.liquidtype == "flowing" then
+
+		--[[ Get flowing direction (function call from flowlib), if there's a liquid.
+		NOTE: According to Qwertymine, flowlib.quickflow is only reliable for liquids with a flowing distance of 7.
+		Luckily, this is exactly what we need if we only care about water, which has this flowing distance. ]]
+		local vec = flowlib.quick_flow(p, node)
+		-- Just to make sure we don't manipulate the speed for no reason
+		if vec.x ~= 0 or vec.y ~= 0 or vec.z ~= 0 then
+			-- Minecraft Wiki: Flowing speed is "about 1.39 meters per second"
+			local f = 1.39
+			-- Set new item moving speed into the direciton of the liquid
+			local newv = vector.multiply(vec, f)
+			self.object:set_acceleration({x = 0, y = 0, z = 0})
+			self.object:set_velocity({x = newv.x, y = -0.22, z = newv.z})
+
+			self.physical_state = true
+			self._flowing = true
+			self.object:set_properties({
+				physical = true
+			})
+			return
+		end
+	elseif self._flowing == true then
+		-- Disable flowing physics if not on/in flowing liquid
+		self._flowing = false
+		return
+	end
+end