mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Include int[] in readObject/writeObject (#8400)

Browse Source 
* Include int[] in readObject/writeObject

* The almighty Object[]

* Order
This commit is contained in:
MEEPofFaith 2023-03-25 11:31:14 -07:00 committed by GitHub
parent deb814ce58
commit f6a8c7509d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/io/TypeIO.java
View File

@ -119,6 +119,15 @@ public class TypeIO{
}else if(object instanceof Team t){ }else if(object instanceof Team t){
write.b((byte)20); write.b((byte)20);
write.b(t.id); write.b(t.id);
}else if(object instanceof int[] i){
write.b((byte)21);
writeInts(write, i);
}else if(object instanceof Object[] objs){
write.b((byte)22);
write.i(objs.length);
for(Object obj : objs){
writeObject(write, obj);
}
}else{ }else{
throw new IllegalArgumentException("Unknown object type: " + object.getClass()); throw new IllegalArgumentException("Unknown object type: " + object.getClass());
} }
@ -184,6 +193,13 @@ public class TypeIO{
} }
case 19 -> new Vec2(read.f(), read.f()); case 19 -> new Vec2(read.f(), read.f());
case 20 -> Team.all[read.ub()]; case 20 -> Team.all[read.ub()];
case 21 -> readInts(read);
case 22 -> {
int objlen = read.i();
Object[] objs = new Object[objlen];
for(int i = 0; i < objlen; i++) objs[i] = readObjectBoxed(read, box);
yield objs;
}
default -> throw new IllegalArgumentException("Unknown object type: " + type); default -> throw new IllegalArgumentException("Unknown object type: " + type);
}; };
} }