From 52375443edb4f0053481ec099fc84d13db16d276 Mon Sep 17 00:00:00 2001
From: Pedro Gimeno <pgimeno@email.fake>
Date: Sun, 24 Mar 2019 18:38:27 +0100
Subject: [PATCH] Fix the tap particles spilling out of the sink

---
 homedecor/bathroom_sanitation.lua      | 29 ++++++++++++++------------
 homedecor/handlers/water_particles.lua |  1 +
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua
index bd592183..eb4a58d1 100644
--- a/homedecor/bathroom_sanitation.lua
+++ b/homedecor/bathroom_sanitation.lua
@@ -81,11 +81,22 @@ homedecor.register("toilet_paper", {
 
 --Sink
 
-local sink_cbox = {
+local sink_sbox = {
 	type = "fixed",
 	fixed = { -5/16, -8/16, 1/16, 5/16, 8/16, 8/16 }
 }
 
+local sink_cbox = {
+	type = "fixed",
+	fixed = {
+		{ -5/16,  5/16, 1/16, -4/16, 8/16, 8/16 },
+		{  5/16,  5/16, 1/16,  4/16, 8/16, 8/16 },
+		{ -5/16,  5/16, 1/16,  5/16, 8/16, 2/16 },
+		{ -5/16,  5/16, 6/16,  5/16, 8/16, 8/16 },
+		{ -4/16, -8/16, 1/16,  4/16, 5/16, 6/16 }
+	}
+}
+
 homedecor.register("sink", {
 	description = S("Bathroom Sink"),
 	mesh = "homedecor_bathroom_sink.obj",
@@ -95,19 +106,10 @@ homedecor.register("sink", {
 		"default_water.png"
 	},
 	inventory_image="homedecor_bathroom_sink_inv.png",
-	selection_box = sink_cbox,
+	selection_box = sink_sbox,
+	collision_box = sink_cbox,
 	groups = {cracky=3},
 	sounds = default.node_sound_stone_defaults(),
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{ -5/16,  5/16, 1/16, -4/16, 8/16, 8/16 },
-			{  5/16,  5/16, 1/16,  4/16, 8/16, 8/16 },
-			{ -5/16,  5/16, 1/16,  5/16, 8/16, 2/16 },
-			{ -5/16,  5/16, 6/16,  5/16, 8/16, 8/16 },
-			{ -4/16, -8/16, 1/16,  4/16, 5/16, 6/16 }
-		}
-	},
 	on_destruct = function(pos)
 		homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z})
 	end
@@ -127,7 +129,8 @@ local function taps_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
 			velocity_x  = { min = -0.1, max = 0.1 },
 			velocity_y  = -0.3,
 			velocity_z  = { min = -0.1, max = 0 },
-			spread      = 0
+			spread      = 0,
+			die_on_collision = true,
 		}
 		homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet")
 	end
diff --git a/homedecor/handlers/water_particles.lua b/homedecor/handlers/water_particles.lua
index d318d582..8042599c 100644
--- a/homedecor/handlers/water_particles.lua
+++ b/homedecor/handlers/water_particles.lua
@@ -71,6 +71,7 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname)
 			amount = 60,
 			time = 0,
 			collisiondetection = true,
+			collision_removal = particledef.die_on_collision,
 			minpos = {x=pos.x - minx, y=pos.y + outlety, z=pos.z - minz},
 			maxpos = {x=pos.x - maxx, y=pos.y + outlety, z=pos.z - maxz},
 			minvel = {x = minvelx, y = velocityy, z = minvelz},