From 2e7a08c0062b37a9db1bada73c29678c6df2bb3e Mon Sep 17 00:00:00 2001 From: Luck Date: Thu, 14 Dec 2017 21:43:44 +0000 Subject: [PATCH] Fix promote / demote command inconsistencies (#609) --- .../luckperms/common/commands/impl/user/UserDemote.java | 2 +- .../luckperms/common/commands/impl/user/UserPromote.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserDemote.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserDemote.java index 91f1d26d1..d9896cb49 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserDemote.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserDemote.java @@ -162,7 +162,7 @@ public class UserDemote extends SubCommand { Message.USER_DEMOTE_SUCCESS.send(sender, user.getFriendlyName(), track.getName(), old, previousGroup.getFriendlyName(), CommandUtils.contextSetToString(context)); if (!silent) { - Message.EMPTY.send(sender, CommandUtils.listToArrowSep(track.getGroups(), previousGroup.getFriendlyName(), old, true)); + Message.EMPTY.send(sender, CommandUtils.listToArrowSep(track.getGroups(), previousGroup.getName(), old, true)); } ExtendedLogEntry.build().actor(sender).acted(user) diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserPromote.java b/common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserPromote.java index b7e1d05d3..196c508ea 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserPromote.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/impl/user/UserPromote.java @@ -116,9 +116,9 @@ public class UserPromote extends SubCommand { return CommandResult.NO_PERMISSION; } - user.setPermission(NodeFactory.newBuilder("group." + first).withExtraContext(context).build()); + user.setPermission(NodeFactory.newBuilder("group." + nextGroup.getId()).withExtraContext(context).build()); - Message.USER_TRACK_ADDED_TO_FIRST.send(sender, user.getFriendlyName(), first, CommandUtils.contextSetToString(context)); + Message.USER_TRACK_ADDED_TO_FIRST.send(sender, user.getFriendlyName(), nextGroup.getFriendlyName(), CommandUtils.contextSetToString(context)); ExtendedLogEntry.build().actor(sender).acted(user) .action("promote", track.getName(), context) @@ -174,7 +174,7 @@ public class UserPromote extends SubCommand { Message.USER_PROMOTE_SUCCESS.send(sender, user.getFriendlyName(), track.getName(), old, nextGroup.getFriendlyName(), CommandUtils.contextSetToString(context)); if (!silent) { - Message.EMPTY.send(sender, CommandUtils.listToArrowSep(track.getGroups(), old, nextGroup.getFriendlyName(), false)); + Message.EMPTY.send(sender, CommandUtils.listToArrowSep(track.getGroups(), old, nextGroup.getName(), false)); } ExtendedLogEntry.build().actor(sender).acted(user)