Skip to content

Commit b50d2e4

Browse files
committed
improve "not in nation" error message
1 parent 6f3c424 commit b50d2e4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/java/pro/cloudnode/smp/smpcore/Messages.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,8 @@ public Messages() {
378378
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.not-in-nation")));
379379
}
380380

381-
public @NotNull Component errorMemberNotYourNation(final @NotNull Member member) {
382-
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.member-not-your-nation")), Placeholder
381+
public @NotNull Component errorMemberNotInNation(final @NotNull Member member) {
382+
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.member-not-in-nation")), Placeholder
383383
.unparsed("player", Optional
384384
.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())));
385385
}

src/main/java/pro/cloudnode/smp/smpcore/command/NationCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public boolean kickMember(
176176

177177
final @NotNull Member targetMember = targetMemberOptional.get();
178178
if (targetMember.nationID == null || !targetMember.nationID.equals(member.nationID))
179-
return sendMessage(sender, SMPCore.messages().errorMemberNotYourNation(targetMember));
179+
return sendMessage(sender, SMPCore.messages().errorMemberNotInNation(targetMember));
180180
if (targetMember.uuid.equals(nation.leaderUUID) || targetMember.uuid.equals(nation.viceLeaderUUID))
181181
return sendMessage(sender, SMPCore.messages().errorKickLeadership());
182182

src/main/resources/messages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ error:
7878
never-joined: <red>(!) Player <gray><player></gray> has never played on the server.</red>
7979
command-on-staff: <red>(!) You cannot use <gray>/<command></gray> on staff.</red>
8080
not-in-nation: <red>(!) You are not a member of any nation.</red>
81-
member-not-your-nation: <red>(!) Member <gray><player></gray> is not a member of your nation.</red>
81+
member-not-in-nation: <red>(!) Member <gray><player></gray> is not a member of the nation.</red>
8282
not-player: <red>(!) You must be a player to use this command.</red>
8383
kick-leadership: <red>(!) You cannot kick a member of the nation's leadership.</red>
8484
nation-not-found: <red>(!) Nation <gray><nation></gray> not found.</red>

0 commit comments

Comments
 (0)