Fix Explosive Arrow the arrow is never killed

Hardel-DW · May 13, 2024 · 0d40ede · 0d40ede
1 parent a8da0ef
commit 0d40ede
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+Update.md
diff --git a/data/enchantplus/enchantment/bow/explosive_arrow.json b/data/enchantplus/enchantment/bow/explosive_arrow.json
@@ -8,21 +8,30 @@
         "minecraft:hit_block": [
             {
                 "effect": {
-                    "type": "minecraft:explode",
-                    "large_particle": {
-                        "type": "minecraft:explosion_emitter"
-                    },
-                    "damage_type": "minecraft:arrow",
-                    "block_interaction": "mob",
-                    "radius": {
-                        "type": "minecraft:linear",
-                        "base": 2.5,
-                        "per_level_above_first": 2
-                    },
-                    "small_particle": {
-                        "type": "minecraft:ash"
-                    },
-                    "sound": "minecraft:entity.generic.explode"
+                    "type": "minecraft:all_of",
+                    "effects": [
+                        {
+                            "type": "minecraft:run_function",
+                            "function": "enchantplus:actions/self_kill"
+                        },
+                        {
+                            "type": "minecraft:explode",
+                            "large_particle": {
+                                "type": "minecraft:explosion_emitter"
+                            },
+                            "damage_type": "minecraft:arrow",
+                            "block_interaction": "mob",
+                            "radius": {
+                                "type": "minecraft:linear",
+                                "base": 2.5,
+                                "per_level_above_first": 2
+                            },
+                            "small_particle": {
+                                "type": "minecraft:ash"
+                            },
+                            "sound": "minecraft:entity.generic.explode"
+                        }
+                    ]
                 },
                 "requirements": {
                     "condition": "minecraft:entity_properties",

diff --git a/data/enchantplus/functions/actions/self_kill.mcfunction b/data/enchantplus/functions/actions/self_kill.mcfunction
@@ -0,0 +1 @@
+kill @s