Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed string array serialization, fixes VFS serialization.

Browse Source
This commit is contained in:
Florian Nücke
2021-01-04 15:02:08 +01:00
parent 893202b235
commit 25c216b4f6
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/li/cil/oc2/common/serialization/NBTSerialization.java
View File

@@ -608,13 +608,15 @@ public final class NBTSerialization {
@Override
public Object deserialize(final INBT nbt, final Class<?> type, @Nullable final Object into) {
String[] data = (String[]) into;
if (nbt instanceof ListNBT && ((ListNBT) nbt).getTagType() == NBTTagIds.TAG_STRING) {
if (nbt instanceof ListNBT) {
final ListNBT serializedData = (ListNBT) nbt;
if (data == null || data.length != serializedData.size()) {
data = new String[serializedData.size()];
}
for (int i = 0; i < serializedData.size(); i++) {
data[i] = serializedData.getString(i);
if (serializedData.isEmpty() || serializedData.getTagType() == NBTTagIds.TAG_STRING) {
if (data == null || data.length != serializedData.size()) {
data = new String[serializedData.size()];
}
for (int i = 0; i < serializedData.size(); i++) {
data[i] = serializedData.getString(i);
}
}
}
return data;
@@ -635,13 +637,15 @@ public final class NBTSerialization {
@Override
public Object deserialize(final INBT nbt, final Class<?> type, @Nullable final Object into) {
UUID[] data = (UUID[]) into;
if (nbt instanceof ListNBT && ((ListNBT) nbt).getTagType() == NBTTagIds.TAG_STRING) {
if (nbt instanceof ListNBT) {
final ListNBT serializedData = (ListNBT) nbt;
if (data == null || data.length != serializedData.size()) {
data = new UUID[serializedData.size()];
}
for (int i = 0; i < serializedData.size(); i++) {
data[i] = UUID.fromString(serializedData.getString(i));
if (serializedData.isEmpty() || serializedData.getTagType() == NBTTagIds.TAG_STRING) {
if (data == null || data.length != serializedData.size()) {
data = new UUID[serializedData.size()];
}
for (int i = 0; i < serializedData.size(); i++) {
data[i] = UUID.fromString(serializedData.getString(i));
}
}
}
return data;