scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-04-11 14:54:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions2

fix: fix bug that could result in the VM's representation of shadow blocks getting into a bad state ()

Browse source
This commit is contained in:
Aaron Dodson 2024-10-08 08:43:13 -07:00 • committed by GitHub
parent 410826b9fa
commit 31189d616b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 8 deletions

25
src/engine/blocks.js
View file

@ -886,23 +886,32 @@ class Blocks {
typeof e.oldInput !== "undefined" &&
oldParent.inputs[e.oldInput].block === e.id
) {
// This block was connected to the old parent's input. We either
// want to restore the shadow block that previously occupied
// this input, or set it to null (which `.shadow` will be if
// there was no shadow previously)
oldParent.inputs[e.oldInput].block =
oldParent.inputs[e.oldInput].shadow;
// This block was connected to an input. We either want to
// restore the shadow block that previously occupied
// this input, or null out the input's block.
const shadow = oldParent.inputs[e.oldInput].shadow;
if (shadow && e.id !== shadow) {
oldParent.inputs[e.oldInput].block = shadow;
this._blocks[shadow].parent = oldParent.id;
} else {
oldParent.inputs[e.oldInput].block = null;
if (e.id !== shadow) {
this._blocks[e.id].parent = null;
}
}
} else if (oldParent.next === e.id) {
// This block was connected to the old parent's next connection.
oldParent.next = null;
this._blocks[e.id].parent = null;
}
this._blocks[e.id].parent = null;
didChange = true;
}
// Is this block a top-level block?
if (typeof e.newParent === "undefined") {
this._addScript(e.id);
if (!this._blocks[e.id].shadow) {
this._addScript(e.id);
}
} else {
// Remove script, if one exists.
this._deleteScript(e.id);