Merge pull request zlainsama#3 from microwin7/fix

Additional fix
microwin7 · Feb 2, 2023 · b4a5bdf · b4a5bdf
2 parents 23605d8 + ca32fb4
commit b4a5bdf
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 40 deletions.
diff --git a/src/main/java/lain/mods/skins/impl/MojangService.java b/src/main/java/lain/mods/skins/impl/MojangService.java
@@ -91,8 +91,8 @@ else if (code / 100 == 2)
                     GameProfile constructed = gson.fromJson(buf.toString(), GameProfile.class);
                     if (!constructed.isComplete()) // why does the server return an incomplete profile? treat it as not found.
                         return Shared.DUMMY;
-                    if (Shared.isOfflinePlayer(constructed.getId(), constructed.getName())) // why does the server return an offline profile? treat it as not found.
-                        return Shared.DUMMY;
+//                    if (Shared.isOfflinePlayer(constructed.getId(), constructed.getName())) // why does the server return an offline profile? treat it as not found.
+//                        return Shared.DUMMY;
                     return new GameProfile(constructed.getId(), constructed.getName()); // reconstruct it because default JsonDeserializer doesn't construct a GameProfile properly, can't use GameProfileSerializer because it's a private class.
                 }
             }

diff --git a/src/main/java/lain/mods/skins/impl/PlayerProfile.java b/src/main/java/lain/mods/skins/impl/PlayerProfile.java
@@ -53,44 +53,44 @@ public void onSuccess(GameProfile filled)
                     }, Runnable::run);
                 }
             }
-            else if (Shared.isOfflinePlayer(key.getId(), key.getName())) // an offline profile that needs resolving
-            {
-                Futures.addCallback(MojangService.getProfile(key.getName()), new FutureCallback<GameProfile>() // resolve it
-                {
-
-                    @Override
-                    public void onFailure(Throwable t)
-                    {
-                    }
-
-                    @Override
-                    public void onSuccess(GameProfile resolved)
-                    {
-                        if (resolved == Shared.DUMMY) // failed
-                            return;
-                        profile.set(resolved);
-
-                        Futures.addCallback(MojangService.fillProfile(resolved), new FutureCallback<GameProfile>() // fill it
-                        {
-
-                            @Override
-                            public void onFailure(Throwable t)
-                            {
-                            }
-
-                            @Override
-                            public void onSuccess(GameProfile filled)
-                            {
-                                if (filled == resolved) // failed or already filled
-                                    return;
-                                profile.set(filled);
-                            }
-
-                        }, Runnable::run);
-                    }
-
-                }, Runnable::run);
-            }
+//            else if (Shared.isOfflinePlayer(key.getId(), key.getName())) // an offline profile that needs resolving
+//            {
+//                Futures.addCallback(MojangService.getProfile(key.getName()), new FutureCallback<GameProfile>() // resolve it
+//                {
+//
+//                    @Override
+//                    public void onFailure(Throwable t)
+//                    {
+//                    }
+//
+//                    @Override
+//                    public void onSuccess(GameProfile resolved)
+//                    {
+//                        if (resolved == Shared.DUMMY) // failed
+//                            return;
+//                        profile.set(resolved);
+//
+//                        Futures.addCallback(MojangService.fillProfile(resolved), new FutureCallback<GameProfile>() // fill it
+//                        {
+//
+//                            @Override
+//                            public void onFailure(Throwable t)
+//                            {
+//                            }
+//
+//                            @Override
+//                            public void onSuccess(GameProfile filled)
+//                            {
+//                                if (filled == resolved) // failed or already filled
+//                                    return;
+//                                profile.set(filled);
+//                            }
+//
+//                        }, Runnable::run);
+//                    }
+//
+//                }, Runnable::run);
+//            }
             else if (key.getProperties().isEmpty()) // an assumed online profile that needs filling
             {
                 Futures.addCallback(MojangService.fillProfile(key), new FutureCallback<GameProfile>() // fill it

diff --git a/src/main/java/lain/mods/skins/providers/MojangCapeProvider.java b/src/main/java/lain/mods/skins/providers/MojangCapeProvider.java
@@ -26,6 +26,7 @@ public ISkin getSkin(IPlayerProfile profile)
         if (_filter != null)
             skin.setSkinFilter(_filter);
         SharedPool.execute(() -> {
+            //if (!Shared.isOfflinePlayer(profile.getPlayerID(), profile.getPlayerName())) {
                 Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> textures = MinecraftUtils.getSessionService().getTextures((GameProfile) profile.getOriginal(), false);
                 if (textures != null && textures.containsKey(MinecraftProfileTexture.Type.CAPE))
                 {
@@ -35,6 +36,7 @@ public ISkin getSkin(IPlayerProfile profile)
                             skin.put(data, "cape");
                     });
                 }
+            //}
         });
         return skin;
     }

diff --git a/src/main/java/lain/mods/skins/providers/MojangSkinProvider.java b/src/main/java/lain/mods/skins/providers/MojangSkinProvider.java
@@ -26,6 +26,7 @@ public ISkin getSkin(IPlayerProfile profile)
         if (_filter != null)
             skin.setSkinFilter(_filter);
         SharedPool.execute(() -> {
+            //if (!Shared.isOfflinePlayer(profile.getPlayerID(), profile.getPlayerName())) {
                 Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> textures = MinecraftUtils.getSessionService().getTextures((GameProfile) profile.getOriginal(), false);
                 if (textures != null && textures.containsKey(MinecraftProfileTexture.Type.SKIN))
                 {
@@ -35,6 +36,7 @@ public ISkin getSkin(IPlayerProfile profile)
                             skin.put(data, SkinData.getSkinType(tex));
                     });
                 }
+            //}
         });
         return skin;
     }