feat(PlayerObject): change skinName to skinOptions

GeorgeV220 · Mar 17, 2023 · 13f26fd · 13f26fd
1 parent b0b20c9
commit 13f26fd
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/core/src/main/java/com/georgev22/skinoverlay/utilities/player/PlayerObject.java b/core/src/main/java/com/georgev22/skinoverlay/utilities/player/PlayerObject.java
@@ -6,6 +6,7 @@
 import com.georgev22.library.utilities.UserManager;
 import com.georgev22.skinoverlay.SkinOverlay;
 import com.georgev22.skinoverlay.utilities.OptionsUtil;
+import com.georgev22.skinoverlay.utilities.SkinOptions;
 import com.georgev22.skinoverlay.utilities.Updater;
 import com.georgev22.skinoverlay.utilities.Utilities;
 import com.georgev22.skinoverlay.utilities.interfaces.SkinOverlayImpl;
@@ -151,7 +152,11 @@ public void playerJoin() {
                 skinOverlay.getLogger().log(Level.SEVERE, "Something went wrong:", e);
                 return null;
             }
-            user.addCustomDataIfNotExists("skinName", "default");
+            try {
+                user.addCustomDataIfNotExists("skinOptions", Utilities.skinOptionsToBytes(new SkinOptions("default")));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
             if (user.getCustomData("skinProperty") != null && !(user.getCustomData("skinProperty") instanceof Property)) {
                 user.addCustomData("skinProperty", Utilities.propertyFromLinkedTreeMap(user.getCustomData("skinProperty")));
             }
@@ -192,8 +197,12 @@ public void updateSkin() {
             }
             if (!isOnline())
                 return user;
-            if (user.getCustomData("skinName").equals("default")) {
-                return user;
+            try {
+                if (Utilities.getSkinOptions(user.getCustomData("skinOptions")).getSkinName().equals("default")) {
+                    return user;
+                }
+            } catch (IOException | ClassNotFoundException e) {
+                throw new RuntimeException(e);
             }
             Utilities.updateSkin(playerObject(), true);
             return user;