Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-16 12:21:25 +01:00
Code Issues Projects Releases Wiki Activity

Fix some bugs with command errors

Browse Source
This commit is contained in:
fullwall 2024-06-12 10:56:05 +08:00
parent 6bb52c0515
commit 81c666eca2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
View File

@ -47,6 +47,7 @@ import net.citizensnpcs.api.trait.TraitName;
import net.citizensnpcs.api.util.DataKey;
import net.citizensnpcs.api.util.ItemStorage;
import net.citizensnpcs.api.util.Messaging;
import net.citizensnpcs.api.util.Placeholders;
import net.citizensnpcs.api.util.Translator;
import net.citizensnpcs.trait.shop.ExperienceAction;
import net.citizensnpcs.trait.shop.ItemAction;
@ -63,7 +64,7 @@ public class CommandTrait extends Trait {
private final Map<Integer, NPCCommand> commands = Maps.newHashMap();
@Persist
private double cost = -1;
@Persist
@Persist(keyType = CommandTraitError.class)
private final Map<CommandTraitError, String> customErrorMessages = Maps.newEnumMap(CommandTraitError.class);
private final Map<String, Set<CommandTraitError>> executionErrors = Maps.newHashMap();
@Persist
@ -445,7 +446,8 @@ public class CommandTrait extends Trait {
return;
sent.add(msg);
}
String messageRaw = customErrorMessages.getOrDefault(msg, msg.setting.asString());
String messageRaw = Placeholders.replace(customErrorMessages.getOrDefault(msg, msg.setting.asString()), player,
npc);
if (transform != null) {
messageRaw = transform.apply(messageRaw);
}