Improve activation logic and armor handling

Tschipcraft · Tschipcraft · commit 20de7bd4d120 · 2025-07-20T22:45:46.000+02:00
- Refactored entity activation distance calculations to bundle and cache position data retrieval calls, and updated batch activation logic for better performance (up to 1ms faster per tick!)
- Fixed v0 save format not correctly upgrading to v1 from 24w11a to 24w20a (affecting major releases 1.20.5 and 1.20.6)
- Improved armor save/resolve functions to include the vanishing curse enchantment in the root proxy chest item
diff --git a/CHANGES.md b/CHANGES.md
@@ -1 +1,3 @@
-- **Added support for Minecraft 1.21.7** 💿
+- Improved performance by refactoring entity activation distance calculations to bundle and cache position data retrieval calls, and updating batch activation logic (up to 1 ms faster per tick!)
+- Fixed v0 save format not correctly upgrading to v1 from 24w11a to 24w20a (affecting major releases 1.20.5 and 1.20.6)
+- Improved armor save/resolve functions to include the vanishing curse enchantment in the root proxy chest item
diff --git a/data/spawnanimations/function/install.mcfunction b/data/spawnanimations/function/install.mcfunction
@@ -5,9 +5,16 @@ scoreboard objectives add ts.sa.timer dummy
 scoreboard objectives add ts.sa.count dummy
 scoreboard objectives add ts.sa.welcome trigger
 
+# Activation distance calculation
 scoreboard objectives add ts.sa.x dummy
 scoreboard objectives add ts.sa.y dummy
 scoreboard objectives add ts.sa.z dummy
+scoreboard players set #minus ts.sa.x -1
+
+# Escape protection for shrunk/emissive entities (see emissive_layer)
+scoreboard objectives add ts.sa.prev_x dummy
+scoreboard objectives add ts.sa.prev_y dummy
+scoreboard objectives add ts.sa.prev_z dummy
 
 # Entity properties
 scoreboard objectives add ts.sa.e.y dummy
diff --git a/data/spawnanimations/function/internal/calc_activation.mcfunction b/data/spawnanimations/function/internal/calc_activation.mcfunction
@@ -2,22 +2,22 @@
 # @s/~ ~ ~ is tested entity; $global is player position
 
 # Get position
-execute store result score @s ts.sa.x run data get entity @s Pos[0]
-execute store result score @s ts.sa.y run data get entity @s Pos[1]
-execute store result score @s ts.sa.z run data get entity @s Pos[2]
+data modify storage spawnanimations:temp Pos set from entity @s Pos
+execute store result score @s ts.sa.x run data get storage spawnanimations:temp Pos[0]
+execute store result score @s ts.sa.y run data get storage spawnanimations:temp Pos[1]
+execute store result score @s ts.sa.z run data get storage spawnanimations:temp Pos[2]
 
 # Calculate diff
 scoreboard players operation @s ts.sa.x -= $global ts.sa.x
 scoreboard players operation @s ts.sa.y -= $global ts.sa.y
 scoreboard players operation @s ts.sa.z -= $global ts.sa.z
 
 # Make sure value is positive
-scoreboard players set $minus ts.sa.x -1
-execute if score @s ts.sa.x matches ..0 run scoreboard players operation @s ts.sa.x *= $minus ts.sa.x
-execute if score @s ts.sa.y matches ..0 run scoreboard players operation @s ts.sa.y *= $minus ts.sa.x
-execute if score @s ts.sa.z matches ..0 run scoreboard players operation @s ts.sa.z *= $minus ts.sa.x
+execute if score @s ts.sa.x matches ..0 run scoreboard players operation @s ts.sa.x *= #minus ts.sa.x
+execute if score @s ts.sa.y matches ..0 run scoreboard players operation @s ts.sa.y *= #minus ts.sa.x
+execute if score @s ts.sa.z matches ..0 run scoreboard players operation @s ts.sa.z *= #minus ts.sa.x
 
-# Add dis together
+# Add distances together
 scoreboard players operation @s ts.sa.x += @s ts.sa.y
 scoreboard players operation @s ts.sa.x += @s ts.sa.z
 
diff --git a/data/spawnanimations/function/internal/entity/ehs/conflict/resolve.mcfunction b/data/spawnanimations/function/internal/entity/ehs/conflict/resolve.mcfunction
@@ -7,7 +7,7 @@ data modify storage spawnanimations:temp equipment set value {}
 data modify storage spawnanimations:temp equipment set from entity @s equipment
 
 # Build entity data
-data modify storage spawnanimations:temp equipment_build set value {body:{id:"minecraft:chest",count:1,components:{"minecraft:container":[{slot:0,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:1,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:2,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:3,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:4,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:5,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:6,item:{id:"minecraft:paper",count:1,components:{"minecraft:custom_data":{TsSaveFormat:2,TsSaRemove:1b}}}}],"minecraft:custom_data":{TsSaRemove:1b}}}}
+data modify storage spawnanimations:temp equipment_build set value {body:{id:"minecraft:chest",count:1,components:{"minecraft:container":[{slot:0,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:1,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:2,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:3,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:4,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:5,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:6,item:{id:"minecraft:paper",count:1,components:{"minecraft:custom_data":{TsSaveFormat:2,TsSaRemove:1b}}}}],"minecraft:enchantments":{"minecraft:vanishing_curse":1},"minecraft:custom_data":{TsSaRemove:1b}}}}
 data modify storage spawnanimations:temp equipment_build.body merge from storage spawnanimations:temp equipment.body
 
 # Save new Armor Items
diff --git a/data/spawnanimations/function/internal/entity/ehs/save_armor.mcfunction b/data/spawnanimations/function/internal/entity/ehs/save_armor.mcfunction
@@ -8,7 +8,7 @@ data modify storage spawnanimations:temp equipment set value {}
 data modify storage spawnanimations:temp equipment set from entity @s equipment
 
 # Build entity data
-data modify storage spawnanimations:temp equipment_build set value {body:{id:"minecraft:chest",count:1,components:{"minecraft:container":[{slot:0,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:1,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:2,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:3,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:4,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:5,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:6,item:{id:"minecraft:paper",count:1,components:{"minecraft:custom_data":{TsSaveFormat:2,TsSaRemove:1b}}}}],"minecraft:custom_data":{TsSaRemove:1b}}}}
+data modify storage spawnanimations:temp equipment_build set value {body:{id:"minecraft:chest",count:1,components:{"minecraft:container":[{slot:0,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:1,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:2,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:3,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:4,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:5,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:6,item:{id:"minecraft:paper",count:1,components:{"minecraft:custom_data":{TsSaveFormat:2,TsSaRemove:1b}}}}],"minecraft:enchantments":{"minecraft:vanishing_curse":1},"minecraft:custom_data":{TsSaRemove:1b}}}}
 
 # Copy Armor Items in correct order
 execute if data storage spawnanimations:temp equipment.feet.id run function spawnanimations:internal/entity/ehs/build_data_entry/armor_0
diff --git a/data/spawnanimations/function/internal/entity/get_animation_speed.mcfunction b/data/spawnanimations/function/internal/entity/get_animation_speed.mcfunction
@@ -1,5 +1,5 @@
 ##by Tschipcraft
-# This function sets the ts.sa.e.speed scoreboard depending on speed and slowness effects of the current entity (@s)
+# Sets the ts.sa.e.speed scoreboard value depending on speed and slowness effects of the current entity (@s)
 
 scoreboard players set @s ts.sa.e.speed 0
 execute if predicate spawnanimations:animation_speed/speed0 run scoreboard players add @s ts.sa.e.speed 1
diff --git a/data/spawnanimations/function/internal/run_activation_batch.mcfunction b/data/spawnanimations/function/internal/run_activation_batch.mcfunction
@@ -1,9 +1,11 @@
 ##by Tschipcraft
 
-# Get pos
-execute store result score $global ts.sa.x run data get entity @s Pos[0]
-execute store result score $global ts.sa.y run data get entity @s Pos[1]
-execute store result score $global ts.sa.z run data get entity @s Pos[2]
+# Get player position
+data modify storage spawnanimations:temp Pos set from entity @s Pos
+execute store result score $global ts.sa.x run data get storage spawnanimations:temp Pos[0]
+execute store result score $global ts.sa.y run data get storage spawnanimations:temp Pos[1]
+execute store result score $global ts.sa.z run data get storage spawnanimations:temp Pos[2]
 
 # Activate entities
-execute as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=..100,limit=10,sort=random] at @s run function spawnanimations:internal/calc_activation
+execute if score $activation_dist ts.sa.settings matches 25..100 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=..100,limit=5,sort=random] at @s run function spawnanimations:internal/calc_activation
+execute if score $activation_dist ts.sa.settings matches 1..24 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=..25,limit=1,sort=random] at @s run function spawnanimations:internal/calc_activation
diff --git a/data/spawnanimations/function/main.mcfunction b/data/spawnanimations/function/main.mcfunction
@@ -13,7 +13,7 @@ execute if score $version ts.sa.settings matches 2587.. as @e[type=#spawnanimati
 # Player nearby
 execute if score $global ts.sa.count matches ..100 as @a[gamemode=!spectator,sort=random,limit=5] at @s run function spawnanimations:internal/run_activation_batch
 # Exclusion criteria
-execute if score $global ts.sa.count matches ..100 as @e[type=!#spawnanimations:exclude,predicate=!spawnanimations:trigger,tag=ts.sa.to_verify,limit=10,sort=random] at @s run function spawnanimations:internal/animation/dig_up/start
+execute if score $global ts.sa.count matches ..100 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,limit=10,sort=random] as @s[predicate=!spawnanimations:trigger] at @s run function spawnanimations:internal/animation/dig_up/start
 
 
 ## Tick dig up animation
diff --git a/data/spawnanimations/function/uninstall.mcfunction b/data/spawnanimations/function/uninstall.mcfunction
@@ -17,6 +17,9 @@ scoreboard objectives remove ts.sa.welcome
 scoreboard objectives remove ts.sa.x
 scoreboard objectives remove ts.sa.y
 scoreboard objectives remove ts.sa.z
+scoreboard objectives remove ts.sa.prev_x
+scoreboard objectives remove ts.sa.prev_y
+scoreboard objectives remove ts.sa.prev_z
 
 scoreboard objectives remove ts.sa.settings
 scoreboard objectives remove ts.sa.distance
diff --git a/data/spawnanimations/functions/install.mcfunction b/data/spawnanimations/functions/install.mcfunction
@@ -5,9 +5,16 @@ scoreboard objectives add ts.sa.timer dummy
 scoreboard objectives add ts.sa.count dummy
 scoreboard objectives add ts.sa.welcome trigger
 
+# Activation distance calculation
 scoreboard objectives add ts.sa.x dummy
 scoreboard objectives add ts.sa.y dummy
 scoreboard objectives add ts.sa.z dummy
+scoreboard players set #minus ts.sa.x -1
+
+# Escape protection for shrunk/emissive entities (see emissive_layer in overlay_33)
+scoreboard objectives add ts.sa.prev_x dummy
+scoreboard objectives add ts.sa.prev_y dummy
+scoreboard objectives add ts.sa.prev_z dummy
 
 # Entity properties
 scoreboard objectives add ts.sa.e.y dummy
diff --git a/data/spawnanimations/functions/internal/calc_activation.mcfunction b/data/spawnanimations/functions/internal/calc_activation.mcfunction
@@ -2,22 +2,22 @@
 # @s/~ ~ ~ is tested entity; $global is player position
 
 # Get position
-execute store result score @s ts.sa.x run data get entity @s Pos[0]
-execute store result score @s ts.sa.y run data get entity @s Pos[1]
-execute store result score @s ts.sa.z run data get entity @s Pos[2]
+data modify storage spawnanimations:temp Pos set from entity @s Pos
+execute store result score @s ts.sa.x run data get storage spawnanimations:temp Pos[0]
+execute store result score @s ts.sa.y run data get storage spawnanimations:temp Pos[1]
+execute store result score @s ts.sa.z run data get storage spawnanimations:temp Pos[2]
 
 # Calculate diff
 scoreboard players operation @s ts.sa.x -= $global ts.sa.x
 scoreboard players operation @s ts.sa.y -= $global ts.sa.y
 scoreboard players operation @s ts.sa.z -= $global ts.sa.z
 
 # Make sure value is positive
-scoreboard players set $minus ts.sa.x -1
-execute if score @s ts.sa.x matches ..0 run scoreboard players operation @s ts.sa.x *= $minus ts.sa.x
-execute if score @s ts.sa.y matches ..0 run scoreboard players operation @s ts.sa.y *= $minus ts.sa.x
-execute if score @s ts.sa.z matches ..0 run scoreboard players operation @s ts.sa.z *= $minus ts.sa.x
+execute if score @s ts.sa.x matches ..0 run scoreboard players operation @s ts.sa.x *= #minus ts.sa.x
+execute if score @s ts.sa.y matches ..0 run scoreboard players operation @s ts.sa.y *= #minus ts.sa.x
+execute if score @s ts.sa.z matches ..0 run scoreboard players operation @s ts.sa.z *= #minus ts.sa.x
 
-# Add dis together
+# Add distances together
 scoreboard players operation @s ts.sa.x += @s ts.sa.y
 scoreboard players operation @s ts.sa.x += @s ts.sa.z
 
diff --git a/data/spawnanimations/functions/internal/entity/ehs/save_armor.mcfunction b/data/spawnanimations/functions/internal/entity/ehs/save_armor.mcfunction
@@ -16,6 +16,6 @@ data modify storage spawnanimations:temp HandItems[0] merge value {Slot:0b}
 data modify storage spawnanimations:temp HandItems[1] merge value {Slot:1b}
 
 # Copy to entity
-data merge entity @s {ArmorItems:[{id:"minecraft:chest",Count:1b,tag:{TsSaRemove:1b}},{id:"minecraft:chest",Count:1b,tag:{TsSaRemove:1b}},{},{}],HandItems:[]}
+data merge entity @s {ArmorItems:[{id:"minecraft:chest",Count:1b,tag:{Enchantments:[{id:"minecraft:vanishing_curse",lvl:1s}],TsSaRemove:1b}},{id:"minecraft:chest",Count:1b,tag:{Enchantments:[{id:"minecraft:vanishing_curse",lvl:1s}],TsSaRemove:1b}},{},{}],HandItems:[]}
 data modify entity @s ArmorItems[0].tag.BlockEntityTag.Items set from storage spawnanimations:temp ArmorItems
 data modify entity @s ArmorItems[1].tag.BlockEntityTag.Items set from storage spawnanimations:temp HandItems
diff --git a/data/spawnanimations/functions/internal/entity/get_animation_speed.mcfunction b/data/spawnanimations/functions/internal/entity/get_animation_speed.mcfunction
@@ -1,5 +1,5 @@
 ##by Tschipcraft
-# This function sets the ts.sa.e.speed scoreboard depending on speed and slowness effects of the current entity (@s)
+# Sets the ts.sa.e.speed scoreboard value depending on speed and slowness effects of the current entity (@s)
 
 scoreboard players set @s ts.sa.e.speed 0
 execute if predicate spawnanimations:animation_speed/speed0 run scoreboard players add @s ts.sa.e.speed 1
diff --git a/data/spawnanimations/functions/internal/run_activation_batch.mcfunction b/data/spawnanimations/functions/internal/run_activation_batch.mcfunction
@@ -1,9 +1,11 @@
 ##by Tschipcraft
 
-# Get pos
-execute store result score $global ts.sa.x run data get entity @s Pos[0]
-execute store result score $global ts.sa.y run data get entity @s Pos[1]
-execute store result score $global ts.sa.z run data get entity @s Pos[2]
+# Get player position
+data modify storage spawnanimations:temp Pos set from entity @s Pos
+execute store result score $global ts.sa.x run data get storage spawnanimations:temp Pos[0]
+execute store result score $global ts.sa.y run data get storage spawnanimations:temp Pos[1]
+execute store result score $global ts.sa.z run data get storage spawnanimations:temp Pos[2]
 
 # Activate entities
-execute as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=..100,limit=10,sort=random] at @s run function spawnanimations:internal/calc_activation
+execute if score $activation_dist ts.sa.settings matches 25..100 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=..100,limit=5,sort=random] at @s run function spawnanimations:internal/calc_activation
+execute if score $activation_dist ts.sa.settings matches 1..24 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=..25,limit=1,sort=random] at @s run function spawnanimations:internal/calc_activation
diff --git a/data/spawnanimations/functions/main.mcfunction b/data/spawnanimations/functions/main.mcfunction
@@ -13,7 +13,7 @@ execute if score $version ts.sa.settings matches 2587.. as @e[type=#spawnanimati
 # Player nearby
 execute if score $global ts.sa.count matches ..100 as @a[gamemode=!spectator,sort=random,limit=5] at @s run function spawnanimations:internal/run_activation_batch
 # Exclusion criteria
-execute if score $global ts.sa.count matches ..100 as @e[type=!#spawnanimations:exclude,predicate=!spawnanimations:trigger,tag=ts.sa.to_verify,limit=10,sort=random] at @s run function spawnanimations:internal/animation/dig_up/start
+execute if score $global ts.sa.count matches ..100 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,limit=10,sort=random] as @s[predicate=!spawnanimations:trigger] at @s run function spawnanimations:internal/animation/dig_up/start
 
 
 ## Tick dig up animation
diff --git a/data/spawnanimations/functions/uninstall.mcfunction b/data/spawnanimations/functions/uninstall.mcfunction
@@ -17,6 +17,9 @@ scoreboard objectives remove ts.sa.welcome
 scoreboard objectives remove ts.sa.x
 scoreboard objectives remove ts.sa.y
 scoreboard objectives remove ts.sa.z
+scoreboard objectives remove ts.sa.prev_x
+scoreboard objectives remove ts.sa.prev_y
+scoreboard objectives remove ts.sa.prev_z
 
 scoreboard objectives remove ts.sa.settings
 scoreboard objectives remove ts.sa.distance
diff --git a/overlay_33/data/spawnanimations/functions/internal/entity/ehs/conflict/resolve.mcfunction b/overlay_33/data/spawnanimations/functions/internal/entity/ehs/conflict/resolve.mcfunction
@@ -7,7 +7,7 @@ data modify storage spawnanimations:temp ArmorItems set from entity @s ArmorItem
 data modify storage spawnanimations:temp HandItems set from entity @s HandItems
 
 # Build entity data
-data modify storage spawnanimations:temp ArmorItemsBuild set value [{id:"minecraft:chest",count:1,components:{"minecraft:container":[{slot:0,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:1,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:2,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:3,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:4,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:5,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:6,item:{id:"minecraft:paper",count:1,components:{"minecraft:custom_data":{TsSaveFormat:1,TsSaRemove:1b}}}}],"minecraft:custom_data":{TsSaRemove:1b}}},{},{},{}]
+data modify storage spawnanimations:temp ArmorItemsBuild set value [{id:"minecraft:chest",count:1,components:{"minecraft:container":[{slot:0,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:1,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:2,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:3,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:4,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:5,item:{id:"minecraft:chest",count:1,components:{"minecraft:custom_data":{TsSaRemove:1b}}}},{slot:6,item:{id:"minecraft:paper",count:1,components:{"minecraft:custom_data":{TsSaveFormat:1,TsSaRemove:1b}}}}],"minecraft:enchantments":{levels:{"minecraft:vanishing_curse":1}},"minecraft:custom_data":{TsSaRemove:1b}}},{},{},{}]
 data modify storage spawnanimations:temp ArmorItemsBuild[0] merge from storage spawnanimations:temp ArmorItems[0]
 
 # Save new Armor Items (legs, chest, head)
diff --git a/overlay_33/data/spawnanimations/functions/internal/entity/ehs/save_armor.mcfunction b/overlay_33/data/spawnanimations/functions/internal/entity/ehs/save_armor.mcfunction
diff --git a/overlay_35/data/spawnanimations/predicates/validate/detect_v0_format.json b/overlay_35/data/spawnanimations/predicates/validate/detect_v0_format.json
diff --git a/overlay_35/overrides.impdoc b/overlay_35/overrides.impdoc
diff --git a/overlay_pre_63/data/spawnanimations/function/internal/entity/ehs/conflict/resolve.mcfunction b/overlay_pre_63/data/spawnanimations/function/internal/entity/ehs/conflict/resolve.mcfunction
diff --git a/overlay_pre_63/data/spawnanimations/function/internal/entity/ehs/save_armor.mcfunction b/overlay_pre_63/data/spawnanimations/function/internal/entity/ehs/save_armor.mcfunction
