From 12214c5bd668b6cc5a5208b95d83c9640e174f07 Mon Sep 17 00:00:00 2001 From: kno10 Date: Sat, 31 Aug 2024 10:16:43 +0200 Subject: [PATCH] Allow salmon, tropical fish, witch huts in rivers (#4605) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As witch huts use flag "liquid_surface", place_on only can be water. If we want on-shore witch huts, this needs to be solved differently. Also, probably no witch huts in deep ocean swamp water? Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4605 Reviewed-by: Mikita Wiśniewski Co-authored-by: kno10 Co-committed-by: kno10 --- mods/ENTITIES/mobs_mc/salmon.lua | 2 +- mods/ENTITIES/mobs_mc/tropical_fish.lua | 2 +- mods/MAPGEN/mcl_structures/witch_hut.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/salmon.lua b/mods/ENTITIES/mobs_mc/salmon.lua index 47a1a5028..c029c0b03 100644 --- a/mods/ENTITIES/mobs_mc/salmon.lua +++ b/mods/ENTITIES/mobs_mc/salmon.lua @@ -52,7 +52,7 @@ local salmon = { makes_footstep_sound = false, swim = true, fly = true, - fly_in = "mcl_core:water_source", + fly_in = { "mcl_core:water_source", "mclx_core:river_water_source" }, breathes_in_water = true, jump = false, view_range = 16, diff --git a/mods/ENTITIES/mobs_mc/tropical_fish.lua b/mods/ENTITIES/mobs_mc/tropical_fish.lua index 6f0c4b43b..47f5b787a 100644 --- a/mods/ENTITIES/mobs_mc/tropical_fish.lua +++ b/mods/ENTITIES/mobs_mc/tropical_fish.lua @@ -97,7 +97,7 @@ local tropical_fish = { makes_footstep_sound = false, swim = true, fly = true, - fly_in = "mcl_core:water_source", + fly_in = { "mcl_core:water_source", "mclx_core:river_water_source" }, breathes_in_water = true, jump = false, view_range = 16, diff --git a/mods/MAPGEN/mcl_structures/witch_hut.lua b/mods/MAPGEN/mcl_structures/witch_hut.lua index 5ac23b144..ed888db95 100644 --- a/mods/MAPGEN/mcl_structures/witch_hut.lua +++ b/mods/MAPGEN/mcl_structures/witch_hut.lua @@ -40,7 +40,7 @@ local function hut_placement_callback(pos,def,pr) end mcl_structures.register_structure("witch_hut",{ - place_on = {"group:sand","group:grass_block","mcl_core:water_source","group:dirt"}, + place_on = {"mcl_core:water_source","mclx_core:river_water_source"}, fill_ratio = 0.01, flags = "place_center_x, place_center_z, liquid_surface, force_placement", sidelen = 8,