From 76f3383c16197faae70abee48cd21cec535cd32c Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sat, 10 Oct 2020 07:34:19 +1300 Subject: [PATCH] Update multiline names --- .../disguise/utilities/DisguiseUtilities.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java index 5bffa9fe..ca23d8d6 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java @@ -2866,7 +2866,9 @@ public class DisguiseUtilities { public static ArrayList getNamePackets(Disguise disguise, String[] internalOldNames) { ArrayList packets = new ArrayList<>(); - String[] newNames = new String[0]; + String[] newNames = + (disguise instanceof PlayerDisguise && !((PlayerDisguise) disguise).isNameVisible()) ? new String[0] : + reverse(disguise.getMultiName()); int[] standIds = disguise.getArmorstandIds(); int[] destroyIds = new int[0]; @@ -2875,18 +2877,15 @@ public class DisguiseUtilities { internalOldNames = new String[]{StringUtils.join(internalOldNames, "\\n")}; } + if (newNames.length > 0) { + newNames = new String[]{StringUtils.join(newNames, "\\n")}; + } + if (!disguise.isPlayerDisguise() || ((PlayerDisguise) disguise).isNameVisible()) { if (disguise.getMultiName().length > 1) { getLogger().info("Multiline names is a premium feature, sorry!"); } - - if (disguise.getMultiName().length > 0) { - newNames = new String[]{StringUtils.join(disguise.getMultiName(), "\\n")}; - } } - } else { - newNames = (disguise instanceof PlayerDisguise && !((PlayerDisguise) disguise).isNameVisible()) ? - new String[0] : reverse(disguise.getMultiName()); } if (internalOldNames.length > newNames.length) {