From: PilzAdam <pilzadam@minetest.net>
Date: Sat, 6 Dec 2014 11:56:58 +0000 (+0100)
Subject: Remove remains of finite liquids from bucket mod
X-Git-Tag: 0.4.11~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=957f94534bbba4cc74251470b0a475903e876231;p=oweals%2Fminetest_game.git

Remove remains of finite liquids from bucket mod
This reverts commit 79856c914d5b9d3eb43bec78840ee811880b30ff.
---

diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua
index 1ad3ef07..6715ebbf 100644
--- a/mods/bucket/init.lua
+++ b/mods/bucket/init.lua
@@ -1,8 +1,6 @@
 -- Minetest 0.4 mod: bucket
 -- See README.txt for licensing and other information.
 
-local LIQUID_MAX = 8  --The number of water levels when liquid_finite is enabled
-
 minetest.register_alias("bucket", "bucket:bucket_empty")
 minetest.register_alias("bucket_water", "bucket:bucket_water")
 minetest.register_alias("bucket_lava", "bucket:bucket_lava")
@@ -71,40 +69,20 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 						itemstack) or itemstack
 				end
 
-				local place_liquid = function(pos, node, source, flowing, fullness)
+				local place_liquid = function(pos, node, source, flowing)
 					if check_protection(pos,
 							user and user:get_player_name() or "",
 							"place "..source) then
 						return
 					end
-					if math.floor(fullness/128) == 1 or
-						not minetest.setting_getbool("liquid_finite") then
-						minetest.add_node(pos, {name=source,
-								param2=fullness})
-						return
-					elseif node.name == flowing then
-						fullness = fullness + node.param2
-					elseif node.name == source then
-						fullness = LIQUID_MAX
-					end
-
-					if fullness >= LIQUID_MAX then
-						minetest.add_node(pos, {name=source,
-								param2=LIQUID_MAX})
-					else
-						minetest.add_node(pos, {name=flowing,
-								param2=fullness})
-					end
+					minetest.add_node(pos, {name=source})
 				end
 
 				-- Check if pointing to a buildable node
-				local fullness = tonumber(itemstack:get_metadata())
-				if not fullness then fullness = LIQUID_MAX end
-
 				if ndef and ndef.buildable_to then
 					-- buildable; replace the node
 					place_liquid(pointed_thing.under, node,
-							source, flowing, fullness)
+							source, flowing)
 				else
 					-- not buildable to; place the liquid above
 					-- check if the node above can be replaced
@@ -112,7 +90,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 					if node and minetest.registered_nodes[node.name].buildable_to then
 						place_liquid(pointed_thing.above,
 								node, source,
-								flowing, fullness)
+								flowing)
 					else
 						-- do not remove the bucket with the liquid
 						return
@@ -138,9 +116,7 @@ minetest.register_craftitem("bucket:bucket_empty", {
 		local node = minetest.get_node(pointed_thing.under)
 		local liquiddef = bucket.liquids[node.name]
 		if liquiddef ~= nil and liquiddef.itemname ~= nil and
-			(node.name == liquiddef.source or
-			(node.name == liquiddef.flowing and
-				minetest.setting_getbool("liquid_finite"))) then
+				node.name == liquiddef.source then
 			if check_protection(pointed_thing.under,
 					user:get_player_name(),
 					"take ".. node.name) then
@@ -149,11 +125,7 @@ minetest.register_craftitem("bucket:bucket_empty", {
 
 			minetest.add_node(pointed_thing.under, {name="air"})
 
-			if node.name == liquiddef.source then
-				node.param2 = LIQUID_MAX
-			end
-			return ItemStack({name = liquiddef.itemname,
-					metadata = tostring(node.param2)})
+			return ItemStack(liquiddef.itemname)
 		end
 	end,
 })