Minor changes

samolego · Jun 18, 2021 · db4bedd · db4bedd
1 parent 135211c
commit db4bedd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/main/java/org/samo_lego/fabrictailor/mixin/MixinPlayerManager.java b/src/main/java/org/samo_lego/fabrictailor/mixin/MixinPlayerManager.java
@@ -1,6 +1,5 @@
 package org.samo_lego.fabrictailor.mixin;
 
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -22,7 +21,7 @@ public abstract class MixinPlayerManager {
                     shift = At.Shift.AFTER
             )
     )
-    private void onPlayerConnect(ClientConnection clientConnection, ServerPlayerEntity player, CallbackInfo ci) throws CommandSyntaxException {
+    private void onPlayerConnect(ClientConnection clientConnection, ServerPlayerEntity player, CallbackInfo ci) {
         String value = ((TailoredPlayer) player).getSkinValue();
         String signature = ((TailoredPlayer) player).getSkinSignature();
         if(value == null || signature == null)

diff --git a/src/main/java/org/samo_lego/fabrictailor/mixin/ServerPlayerEntityMixin_TailoredPlayer.java b/src/main/java/org/samo_lego/fabrictailor/mixin/ServerPlayerEntityMixin_TailoredPlayer.java
@@ -158,9 +158,5 @@ private void readCustomDataFromNbt(NbtCompound tag, CallbackInfo ci) {
                 this.setSkin(this.skinValue, this.skinSignature, false);
             }
         }
-        /*if(this.skinValue == null || this.skinSignature == null) {
-            System.out.println("Fetching skin! ");
-            fetchSkinByName(player, player.getGameProfile().getName(), false);
-        }*/
     }
 }
diff --git a/src/main/java/org/samo_lego/fabrictailor/util/SkinFetcher.java b/src/main/java/org/samo_lego/fabrictailor/util/SkinFetcher.java
@@ -122,25 +122,26 @@ public static void fetchSkinByName(ServerPlayerEntity player, String playername,
 
         SkullBlockEntity.loadProperties(profile, gameProfile -> {
             PropertyMap propertyMap = gameProfile.getProperties();
-            MinecraftServer server = player.getServer();
 
             // We check if player is online as well as there is
             // edge case when skin for your own self doesn't get fetched (#30)
-            if(propertyMap.containsKey("textures") && server != null && server.getPlayerManager().getPlayer(playername) == null) {
+            if(propertyMap.containsKey("textures")) {
                 Property textures = propertyMap.get("textures").iterator().next();
                 String value = textures.getValue();
                 String signature = textures.getSignature();
                 if(
-                        TATERZENS_LOADED && TaterzensCompatibility.setTaterzenSkin(player, value, signature) ||
-                        (((TailoredPlayer) player).setSkin(value, signature, true) && giveFeedback)
+                        !value.equals("") && !signature.equals("") &&
+                        (
+                            TATERZENS_LOADED && TaterzensCompatibility.setTaterzenSkin(player, value, signature) ||
+                            (((TailoredPlayer) player).setSkin(value, signature, true) && giveFeedback)
+                        )
                 ) {
                     player.sendMessage(
                             new TranslatedText("command.fabrictailor.skin.set.success").formatted(Formatting.GREEN),
                             false
                     );
+                    return;
                 }
-
-                return;
             }
             // Getting skin data from ely.by api, since it can be used with usernames
             // it also includes mojang skins