Fixes deserialization of UUIDs

ME1312 · May 6, 2023 · 3e204c6 · 3e204c6
1 parent b060fb6
commit 3e204c6
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/GalaxiAPI/base/src/net/ME1312/Galaxi/Library/Map/ObjectMapValue.java b/GalaxiAPI/base/src/net/ME1312/Galaxi/Library/Map/ObjectMapValue.java
@@ -232,8 +232,8 @@ public UUID asUUID() {
     }
     private static UUID parseUUID(Object obj) {
         if (obj instanceof Collection) {
-            Iterator<Long> i = ((Collection<Long>) obj).iterator();
-            return new UUID(i.next(), i.next());
+            Iterator<Number> i = ((Collection<Number>) obj).iterator();
+            return new UUID(i.next().longValue(), i.next().longValue());
         } else if (obj != null) {
             return UUID.fromString(obj.toString());
         } else {
@@ -341,7 +341,16 @@ public boolean isString() {
      * @return UUID Status
      */
     public boolean isUUID() {
-        return ((obj instanceof List && Try.all.run(() -> asLongList().get(1).longValue())) || (obj instanceof String && Try.all.run(() -> UUID.fromString(asString()))));
+        if (obj instanceof Collection) {
+            Iterator<Number> i = ((Collection<Number>) obj).iterator();
+            if (i.hasNext()) {
+                i.next();
+                return i.hasNext();
+            }
+        } else if (obj instanceof String) {
+            return true;
+        }
+        return false;
     }
 
     @Override