Skip to content

Commit 4508dfd

Browse files
committed
fix non 1.13 schematic includes out of range blocks when cb option is on
1 parent ed7253d commit 4508dfd

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

scripts/schematic_export/schematic_export.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function schematic_export() {
201201
if (o.colamount[a] > 0) { // Calculate note blocks for this tick
202202
for (b = 0; b <= o.collast[a]; b += 1) {
203203
if (o.song_exists[a, b] && (o.lockedlayer[b] = 0 || o.sch_exp_includelocked)) {
204-
if ((o.song_key[a, b] > 32 && o.song_key[a, b] < 58) || (o.command_block && o.song_key[a, b] >= 9 && o.song_key[a, b] <= 81)) {
204+
if ((o.song_key[a, b] > 32 && o.song_key[a, b] < 58) || (o.structure && o.command_block && o.song_key[a, b] >= 9 && o.song_key[a, b] <= 81)) {
205205
nblockins[nblocks] = ds_list_find_index(other.instrument_list, o.song_ins[a, b])
206206
nblockkey[nblocks] = o.song_key[a, b]
207207
nblockpit[nblocks] = o.song_pit[a, b]
@@ -468,7 +468,7 @@ function schematic_export() {
468468
if (o.colamount[a] > 0) { // Calculate note blocks for this tick
469469
for (b = 0; b <= o.collast[a]; b += 1) {
470470
if (o.song_exists[a, b] && (o.lockedlayer[b] = 0 || o.sch_exp_includelocked)) {
471-
if ((o.song_key[a, b] > 32 && o.song_key[a, b] < 58) || (o.command_block && o.song_key[a, b] >= 9 && o.song_key[a, b] <= 81)) {
471+
if ((o.song_key[a, b] > 32 && o.song_key[a, b] < 58) || (o.structure && o.command_block && o.song_key[a, b] >= 9 && o.song_key[a, b] <= 81)) {
472472
nblockins[nblocks] = ds_list_find_index(other.instrument_list, o.song_ins[a, b])
473473
nblockkey[nblocks] = o.song_key[a, b]
474474
nblockpit[nblocks] = o.song_pit[a, b]

0 commit comments

Comments
 (0)