Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #11697

Browse Source
This commit is contained in:
Anuken
2026-02-20 17:03:47 -05:00
parent 76dc529d23
commit 7da63ac504
2 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/mindustry/mod/DataPatcher.java
View File

@@ -289,12 +289,12 @@ public class DataPatcher{
var copy = s.copy();
reset(() -> s.set(copy));
assignValue(object, field, metadata, () -> s.get(i), val -> s.set(i, val), value, false);
assignValue(object, field, metadata, () -> s.get(i), val -> s.set(i, val), value, true);
}else{
modifiedField(parentObject, parentField, copyArray(object));
var fobj = object;
assignValue(object, field, metadata, () -> Array.get(fobj, i), val -> Array.set(fobj, i, val), value, false);
assignValue(object, field, metadata, () -> Array.get(fobj, i), val -> Array.set(fobj, i, val), value, true);
}
}
}else if(object instanceof ObjectSet set && field.equals("+")){
@@ -503,7 +503,16 @@ public class DataPatcher{
return null;
}
return new Object[]{object instanceof Seq s ? s.get(i) : Array.get(object, i), null};
Object prev = object instanceof Seq s ? s.get(i) : Array.get(object, i);
reset(() -> {
if(object instanceof Seq seq){
seq.set(i, prev);
}else{
Array.set(object, i, prev);
}
});
return new Object[]{prev, metadata != null ? new FieldData(object instanceof Seq<?> ? metadata.elementType : metadata.type.getComponentType(), null, null) : null};
}else if(object instanceof ObjectMap map){
Object key = convertKeyType(field, metadata.keyType);
if(key == null){
@@ -558,6 +567,15 @@ public class DataPatcher{
}
});
}
}else if(target instanceof Seq<?> || target.getClass().isArray()){
int i = Integer.parseInt(field);
resetters.add(() -> {
if(target instanceof Seq seq){
seq.set(i, value);
}else{
Array.set(target, i, value);
}
});
}else{
warn("Missing field " + field + " for object " + target);
}