Skip to content

Commit f754033

Browse files
authored
Zauber Cauldrons: Fix Edge-Case Causing Leftover Custom Liquid Display Entities (#941)
* Check for Water instead of Not-Powdered-Snow * Call Destroy Function upon Invalid Recipe
1 parent c77c3a9 commit f754033

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/functions/recipes/potions/invalid_recipe.mcfunction

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ execute align xyz run kill @e[type=item,dx=0,dy=0,dz=0]
88
#visuals
99
scoreboard players reset $expected_item_amount gm4_zc_fullness
1010
summon tnt
11-
kill @s
11+
12+
# kill marker and related entities
13+
function gm4_zauber_cauldrons:cauldron/structure/destroy

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/functions/recipes/potions/lingering/check_liquid.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
# the select_effect function is generated via beet from templates
77
execute if score $has_powder_snow gm4_zc_data matches 1.. run function gm4_zauber_cauldrons:recipes/potions/lingering/select_effect
88

9-
# no powder snow
10-
execute unless score $has_powder_snow gm4_zc_data matches 1.. run function gm4_zauber_cauldrons:recipes/potions/invalid_recipe
9+
# water used instead of powder snow
10+
execute if score $has_water gm4_zc_data matches 1.. run function gm4_zauber_cauldrons:recipes/potions/invalid_recipe

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/functions/recipes/potions/splash/check_liquid.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
# the select_effect function is generated via beet from templates
77
execute if score $has_powder_snow gm4_zc_data matches 1.. run function gm4_zauber_cauldrons:recipes/potions/splash/select_effect
88

9-
# no powder snow
10-
execute unless score $has_powder_snow gm4_zc_data matches 1.. run function gm4_zauber_cauldrons:recipes/potions/invalid_recipe
9+
# water used instead of powder snow
10+
execute if score $has_water gm4_zc_data matches 1.. run function gm4_zauber_cauldrons:recipes/potions/invalid_recipe

0 commit comments

Comments
 (0)