Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-29 11:39:14 +00:00
Code Issues Releases 1 Activity

Fix wrong timestamp/UUID being used for legacy conversion (#167)

Browse Source 
* Maintain legacy snapshot IDs when updating

* Also maintain timestamps during conversion

* Actually implement timestamp fix in LegacyConverter
This commit is contained in:
William
2023-09-22 16:12:08 +01:00
committed by GitHub
parent 635edb930f
commit 7034a97d3a
5 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bukkit/src/main/java/net/william278/husksync/util/BukkitLegacyConverter.java
View File

@@ -39,6 +39,7 @@ import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import java.io.ByteArrayInputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.OffsetDateTime;
import java.util.*;
public class BukkitLegacyConverter extends LegacyConverter {
@@ -49,7 +50,8 @@ public class BukkitLegacyConverter extends LegacyConverter {
@NotNull
@Override
public DataSnapshot.Packed convert(@NotNull byte[] data) throws DataAdapter.AdaptionException {
public DataSnapshot.Packed convert(@NotNull byte[] data, @NotNull UUID id,
@NotNull OffsetDateTime timestamp) throws DataAdapter.AdaptionException {
final JSONObject object = new JSONObject(plugin.getDataAdapter().bytesToString(data));
final int version = object.getInt("format_version");
if (version != 3) {
@@ -61,6 +63,7 @@ public class BukkitLegacyConverter extends LegacyConverter {
// Read legacy data from the JSON object
final DataSnapshot.Builder builder = DataSnapshot.builder(plugin)
.id(id).timestamp(timestamp)
.saveCause(DataSnapshot.SaveCause.CONVERTED_FROM_V2)
.data(readStatusData(object));
readInventory(object).ifPresent(builder::inventory);