From 73d2d6b1a5d0b6fac69434583e71e6f8c45ade96 Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Sun, 27 Dec 2020 13:31:06 +1300
Subject: [PATCH] Let /saveskin ignore .png

---
 .../commands/utils/GrabSkinCommand.java       | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java b/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java
index 2aa1712b..53a53c92 100644
--- a/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java
+++ b/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java
@@ -29,7 +29,9 @@ public class GrabSkinCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) {
         if (sender instanceof Player && !sender.isOp() &&
                 (!LibsPremium.isPremium() || LibsPremium.getPaidInformation() == LibsPremium.getPluginInformation())) {
-            sender.sendMessage(ChatColor.RED + "This is the free version of Lib's Disguises, player commands are limited to console and Operators only! Purchase the plugin for non-admin usage!");
+            sender.sendMessage(ChatColor.RED +
+                    "This is the free version of Lib's Disguises, player commands are limited to console and Operators only! Purchase the plugin for " +
+                    "non-admin usage!");
             return true;
         }
 
@@ -54,8 +56,8 @@ public class GrabSkinCommand implements CommandExecutor {
             return true;
         }
 
-        if (tName == null && skin.matches("(.*\\/)?[a-zA-Z0-9_-]{3,20}\\.png")) {
-            tName = skin.substring(skin.lastIndexOf("/") + 1, skin.lastIndexOf("."));
+        if (tName == null && skin.matches("(.*\\/)?[a-zA-Z0-9_-]{3,20}(\\.png)?")) {
+            tName = skin.substring(skin.lastIndexOf("/") + 1, skin.contains(".") ? skin.lastIndexOf(".") : skin.length());
 
             if (DisguiseUtilities.hasGameProfile(tName)) {
                 tName = null;
@@ -101,8 +103,7 @@ public class GrabSkinCommand implements CommandExecutor {
                 }
 
                 if (profile.getName() == null || !profile.getName().equals(nName)) {
-                    profile = ReflectionManager
-                            .getGameProfileWithThisSkin(profile.getUUID(), profile.getName(), profile);
+                    profile = ReflectionManager.getGameProfileWithThisSkin(profile.getUUID(), profile.getName(), profile);
                 }
 
                 DisguiseAPI.addGameProfile(nName, profile);
@@ -112,32 +113,31 @@ public class GrabSkinCommand implements CommandExecutor {
                 int start = 0;
                 int msg = 1;
 
-               //if (NmsVersion.v1_13.isSupported()) {
-                    ComponentBuilder builder = new ComponentBuilder("").appendLegacy(LibsMsg.CLICK_TO_COPY.get());
+                //if (NmsVersion.v1_13.isSupported()) {
+                ComponentBuilder builder = new ComponentBuilder("").appendLegacy(LibsMsg.CLICK_TO_COPY.get());
 
-                    while (start < string.length()) {
-                        int end = Math.min(256, string.length() - start);
+                while (start < string.length()) {
+                    int end = Math.min(256, string.length() - start);
 
-                        String sub = string.substring(start, start + end);
+                    String sub = string.substring(start, start + end);
 
-                        builder.append(" ");
+                    builder.append(" ");
 
-                        if (string.length() <= 256) {
-                            builder.appendLegacy(LibsMsg.CLICK_TO_COPY_DATA.get());
-                        } else {
-                            builder.reset();
-                            builder.appendLegacy(LibsMsg.CLICK_COPY.get(msg));
-                        }
-
-                        start += end;
-
-                        builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, sub));
-                        builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
-                                new ComponentBuilder(LibsMsg.CLICK_TO_COPY_HOVER.get() + " " + msg).create()));
-                        msg += 1;
+                    if (string.length() <= 256) {
+                        builder.appendLegacy(LibsMsg.CLICK_TO_COPY_DATA.get());
+                    } else {
+                        builder.reset();
+                        builder.appendLegacy(LibsMsg.CLICK_COPY.get(msg));
                     }
 
-                    sender.spigot().sendMessage(builder.create());
+                    start += end;
+
+                    builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, sub));
+                    builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(LibsMsg.CLICK_TO_COPY_HOVER.get() + " " + msg).create()));
+                    msg += 1;
+                }
+
+                sender.spigot().sendMessage(builder.create());
                 /*} else {
                     LibsMsg.SKIN_DATA.send(sender, string);
                 }*/