Fixed custom name still being set despite being overridden

2020-05-08 16:35:25 +12:00
parent a963e86323
commit 2adca62a83
10 changed files with 53 additions and 34 deletions
--- a/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
@@ -908,7 +908,11 @@ public class DisguiseParser {
                }
            }

-            if (DisguiseConfig.isArmorstandsName() && methodToUse.getName().equals("setName") && !sender.hasPermission("libsdisguises.multiname")) {
+            if (DisguiseConfig.isArmorstandsName() &&
+                    ((methodToUse.getName().equals("setName") && disguise.isPlayerDisguise()) ||
+                            (DisguiseConfig.isOverrideCustomNames() &&
+                                    methodToUse.getName().equals("setCustomName"))) &&
+                    !sender.hasPermission("libsdisguises.multiname")) {
                valueToSet = DisguiseUtilities.quoteNewLine((String) valueToSet);
            }