This commit is contained in:
barsdeveloper
2024-05-31 15:09:48 +02:00
parent 1c2778fbf8
commit ecc71b76d1
45 changed files with 1191 additions and 1078 deletions

View File

@@ -56,18 +56,18 @@ export default class BlueprintEntity extends ObjectEntity {
/** @param {ObjectEntity} entity */
mergeWith(entity) {
if (!entity.ScriptVariables || entity.ScriptVariables.length === 0) {
if (!entity.ScriptVariables || entity.ScriptVariables.values.length === 0) {
return this
}
if (!this.ScriptVariables || this.ScriptVariables.length === 0) {
if (!this.ScriptVariables || this.ScriptVariables.values.length === 0) {
this.ScriptVariables = entity.ScriptVariables
}
let scriptVariables = Utility.mergeArrays(
this.ScriptVariables,
entity.ScriptVariables,
this.ScriptVariables.values,
entity.ScriptVariables.values,
(l, r) => l.OriginalChangeId.value == r.OriginalChangeId.value
)
if (scriptVariables.length === this.ScriptVariables.length) {
if (scriptVariables.length === this.ScriptVariables.values.length) {
return this
}
const entries = scriptVariables.concat(scriptVariables).map((v, i) => {