Skip to content

Commit c68dca9

Browse files
SnaveSutitSnaveSutit
committed
🐛 Fix #444
Related issues: - Fixed #443 - Fixed #441 - Fixed #435 - Fixed #434 - Fixed #427 - Fixed #421 - Fixed #441
1 parent 0caba90 commit c68dca9

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

‎src/systems/datapackCompiler/1.20.4/animation.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,10 @@ dir <%export_namespace%> {
847847
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
848848
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
849849
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
850-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
850+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
851851
}
852852
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
853-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
853+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
854854
}
855855
}
856856
}

‎src/systems/datapackCompiler/1.20.4/static.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ dir <%export_namespace%> {
400400
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
401401
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
402402
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
403-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
403+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
404404
}
405405
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
406-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
406+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
407407
}
408408
}
409409
}

‎src/systems/datapackCompiler/1.20.5/animation.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,10 @@ dir <%export_namespace%> {
847847
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
848848
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
849849
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
850-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
850+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
851851
}
852852
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
853-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
853+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
854854
}
855855
}
856856
}

‎src/systems/datapackCompiler/1.20.5/static.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ dir <%export_namespace%> {
400400
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
401401
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
402402
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
403-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
403+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
404404
}
405405
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
406-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
406+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
407407
}
408408
}
409409
}

‎src/systems/datapackCompiler/1.21.2/animation.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,10 @@ dir <%export_namespace%> {
847847
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
848848
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
849849
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
850-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
850+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
851851
}
852852
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
853-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
853+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
854854
}
855855
}
856856
}

‎src/systems/datapackCompiler/1.21.2/static.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ dir <%export_namespace%> {
400400
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
401401
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
402402
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
403-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
403+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
404404
}
405405
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
406-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
406+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
407407
}
408408
}
409409
}

‎src/systems/datapackCompiler/1.21.4/animation.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,10 @@ dir <%export_namespace%> {
847847
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
848848
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
849849
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
850-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
850+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
851851
}
852852
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
853-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
853+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
854854
}
855855
}
856856
}

‎src/systems/datapackCompiler/1.21.4/static.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ dir <%export_namespace%> {
400400
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
401401
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
402402
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
403-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
403+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
404404
}
405405
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
406-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
406+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
407407
}
408408
}
409409
}

‎src/systems/datapackCompiler/1.21.5/animation.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,10 @@ dir <%export_namespace%> {
847847
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
848848
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
849849
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
850-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
850+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
851851
}
852852
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
853-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
853+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
854854
}
855855
}
856856
}

‎src/systems/datapackCompiler/1.21.5/static.mcb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ dir <%export_namespace%> {
400400
execute on passengers if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] run block zzz/this/as_data {
401401
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator' && v.config?.use_entity)) as locator {
402402
# REVIEW - This will not kill locators or cameras that have been summoned using an old export of the rig.
403-
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.type + '_' + locator.name%>
403+
function ./zzz/this/kill_locator with entity @s data.locators.<%locator.storage_name%>
404404
}
405405
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'camera')) as camera {
406-
function ./zzz/this/kill_camera with entity @s data.locators.<%camera.type + '_' + camera.name%>
406+
function ./zzz/this/kill_camera with entity @s data.cameras.<%camera.storage_name%>
407407
}
408408
}
409409
}

0 commit comments

Comments
 (0)