Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-03 06:57:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix format parsing in /kit (Fixes #5651)

Browse Source
This commit is contained in:
Josh Roy 2024-02-09 22:40:15 -05:00
parent 596ba6e2f5
commit 544f69aec8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Essentials/src/main/java/com/earth2me/essentials/commands/Commandkit.java
View File

@ -3,9 +3,8 @@ package com.earth2me.essentials.commands;
import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.Kit; import com.earth2me.essentials.Kit;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.CommonPlaceholders; import com.earth2me.essentials.utils.AdventureUtil;
import com.earth2me.essentials.utils.StringUtil; import com.earth2me.essentials.utils.StringUtil;
import net.ess3.api.IUser;
import net.ess3.api.TranslatableException; import net.ess3.api.TranslatableException;
import org.bukkit.Server; import org.bukkit.Server;
@ -24,7 +23,7 @@ public class Commandkit extends EssentialsCommand {
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
if (args.length < 1) { if (args.length < 1) {
final String kitList = ess.getKits().listKits(ess, user); final String kitList = ess.getKits().listKits(ess, user);
user.sendTl(kitList.length() > 0 ? "kits" : "noKits", kitList); user.sendTl(kitList.length() > 0 ? "kits" : "noKits", AdventureUtil.parsed(kitList));
throw new NoChargeException(); throw new NoChargeException();
} else if (args.length > 1 && user.isAuthorized("essentials.kit.others")) { } else if (args.length > 1 && user.isAuthorized("essentials.kit.others")) {
giveKits(getPlayer(server, user, args, 1), user, StringUtil.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)).trim()); giveKits(getPlayer(server, user, args, 1), user, StringUtil.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)).trim());
@ -37,7 +36,7 @@ public class Commandkit extends EssentialsCommand {
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
if (args.length < 2) { if (args.length < 2) {
final String kitList = ess.getKits().listKits(ess, null); final String kitList = ess.getKits().listKits(ess, null);
sender.sendTl(kitList.length() > 0 ? "kits" : "noKits", kitList); sender.sendTl(kitList.length() > 0 ? "kits" : "noKits", AdventureUtil.parsed(kitList));
throw new NoChargeException(); throw new NoChargeException();
} else { } else {
final User userTo = getPlayer(server, args, 1, true, false); final User userTo = getPlayer(server, args, 1, true, false);
@ -45,7 +44,7 @@ public class Commandkit extends EssentialsCommand {
for (final String kitName : args[0].toLowerCase(Locale.ENGLISH).split(",")) { for (final String kitName : args[0].toLowerCase(Locale.ENGLISH).split(",")) {
new Kit(kitName, ess).expandItems(userTo); new Kit(kitName, ess).expandItems(userTo);
sender.sendTl("kitGiveTo", kitName, CommonPlaceholders.displayName((IUser) userTo)); sender.sendTl("kitGiveTo", kitName, userTo.getDisplayName());
userTo.sendTl("kitReceive", kitName); userTo.sendTl("kitReceive", kitName);
} }
} }
@ -81,7 +80,7 @@ public class Commandkit extends EssentialsCommand {
kit.chargeUser(userTo); kit.chargeUser(userTo);
if (!userFrom.equals(userTo)) { if (!userFrom.equals(userTo)) {
userFrom.sendTl("kitGiveTo", kit.getName(), CommonPlaceholders.displayName((IUser) userTo)); userFrom.sendTl("kitGiveTo", kit.getName(), userTo.getDisplayName());
} }
userTo.sendTl("kitReceive", kit.getName()); userTo.sendTl("kitReceive", kit.getName());