Remove some illegal placeholders

This commit is contained in:
libraryaddict 2021-05-15 11:25:32 +12:00
parent 807a163256
commit 11e7e1238c

View File

@ -451,16 +451,12 @@ public class DisguiseParser {
public static String[] parsePlaceholders(String[] args, String userName, String userDisplayname, String userSkin, String targetName, public static String[] parsePlaceholders(String[] args, String userName, String userDisplayname, String userSkin, String targetName,
String targetDisplayname, String targetSkin, EntityEquipment equip, EntityEquipment targetEquip) { String targetDisplayname, String targetSkin, EntityEquipment equip, EntityEquipment targetEquip) {
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
String arg = args[i]; String arg = args[i];
arg = replace(arg, "%name%", userName); arg = replace(arg, "%name%", userName);
arg = replace(arg, "%displayname%", userDisplayname); arg = replace(arg, "%displayname%", userDisplayname);
arg = replace(arg, "%skin%", userSkin); arg = replace(arg, "%skin%", userSkin);
arg = replace(arg, "%user-name%", userName);
arg = replace(arg, "%user-displayname%", userDisplayname);
arg = replace(arg, "%user-skin%", userSkin);
arg = replace(arg, "%held-item%", equip == null ? null : equip.getItemInMainHand()); arg = replace(arg, "%held-item%", equip == null ? null : equip.getItemInMainHand());
arg = replace(arg, "%offhand-item%", equip == null ? null : equip.getItemInOffHand()); arg = replace(arg, "%offhand-item%", equip == null ? null : equip.getItemInOffHand());
arg = replace(arg, "%armor%", equip == null ? null : equip.getArmorContents()); arg = replace(arg, "%armor%", equip == null ? null : equip.getArmorContents());