From fb98eb6e42fcdec34129c2e834ec7f5010ac5ddd Mon Sep 17 00:00:00 2001 From: Rubix327 Date: Mon, 28 Aug 2023 03:41:30 +0300 Subject: [PATCH] Serialization fix & warning --- pom.xml | 2 +- src/main/java/org/mineacademy/fo/SerializeUtil.java | 2 +- src/main/java/org/mineacademy/fo/collection/SerializedMap.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9103fab69..4951110b6 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.mineacademy Foundation - 6.2.5.8 + 6.2.5.10 jar Foundation diff --git a/src/main/java/org/mineacademy/fo/SerializeUtil.java b/src/main/java/org/mineacademy/fo/SerializeUtil.java index f6e3cd203..cb7861f0b 100644 --- a/src/main/java/org/mineacademy/fo/SerializeUtil.java +++ b/src/main/java/org/mineacademy/fo/SerializeUtil.java @@ -599,7 +599,7 @@ else if (classOf == CompChatColor.class) else if (classOf == CompColor.class) object = CompColor.valueOf(object.toString()); - else if (classOf == ItemStack.class && mode == Mode.JSON) + else if (classOf == ItemStack.class) object = deserializeItemStack(mode, object); else if (classOf == UUID.class) diff --git a/src/main/java/org/mineacademy/fo/collection/SerializedMap.java b/src/main/java/org/mineacademy/fo/collection/SerializedMap.java index a5c1a8491..e7b3cdb85 100644 --- a/src/main/java/org/mineacademy/fo/collection/SerializedMap.java +++ b/src/main/java/org/mineacademy/fo/collection/SerializedMap.java @@ -1188,7 +1188,8 @@ private static SerializedMap of(@NonNull Object object, Mode mode) { if (object instanceof List && ((List) object).isEmpty()) return new SerializedMap(mode); - throw new FoException("Cannot instantiate SerializedMap(" + mode + ") from " + object.getClass().getSimpleName() + ": " + object); + throw new FoException("Cannot instantiate SerializedMap(" + mode + ") from " + object.getClass().getSimpleName() + ": " + object + "\n" + + "If you are using this object as a key in your map, then it cannot be deserialized as a key. Use a custom class instead of a map."); } /**