Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-12-01 07:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Make the clone commands work for existing tracks/groups too

Browse Source
This commit is contained in:
Luck 2017-03-11 18:30:27 +00:00
parent 91626f079d
commit 281060a972
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupClone.java
View File

@ -41,7 +41,7 @@ import java.util.List;
public class GroupClone extends SubCommand<Group> { public class GroupClone extends SubCommand<Group> {
public GroupClone() { public GroupClone() {
super("clone", "Clone the group", Permission.GROUP_CLONE, Predicates.not(1), super("clone", "Clone the group", Permission.GROUP_CLONE, Predicates.not(1),
Arg.list(Arg.create("name", true, "the name of the clone")) Arg.list(Arg.create("name", true, "the name of the group to clone onto"))
); );
} }
@ -53,15 +53,7 @@ public class GroupClone extends SubCommand<Group> {
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }
if (plugin.getStorage().loadGroup(newGroupName).join()) { plugin.getStorage().createAndLoadGroup(newGroupName, CreationCause.COMMAND).join();
Message.GROUP_ALREADY_EXISTS.send(sender);
return CommandResult.INVALID_ARGS;
}
if (!plugin.getStorage().createAndLoadGroup(newGroupName, CreationCause.COMMAND).join()) {
Message.CREATE_GROUP_ERROR.send(sender);
return CommandResult.FAILURE;
}
Group newGroup = plugin.getGroupManager().getIfLoaded(newGroupName); Group newGroup = plugin.getGroupManager().getIfLoaded(newGroupName);
if (newGroup == null) { if (newGroup == null) {

12
common/src/main/java/me/lucko/luckperms/common/commands/track/TrackClone.java
View File

@ -41,7 +41,7 @@ import java.util.List;
public class TrackClone extends SubCommand<Track> { public class TrackClone extends SubCommand<Track> {
public TrackClone() { public TrackClone() {
super("clone", "Clone the track", Permission.TRACK_CLONE, Predicates.not(1), super("clone", "Clone the track", Permission.TRACK_CLONE, Predicates.not(1),
Arg.list(Arg.create("name", true, "the name of the clone")) Arg.list(Arg.create("name", true, "the name of the track to clone onto"))
); );
} }
@ -53,15 +53,7 @@ public class TrackClone extends SubCommand<Track> {
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }
if (plugin.getStorage().loadTrack(newTrackName).join()) { plugin.getStorage().createAndLoadTrack(newTrackName, CreationCause.INTERNAL).join();
Message.TRACK_ALREADY_EXISTS.send(sender);
return CommandResult.INVALID_ARGS;
}
if (!plugin.getStorage().createAndLoadTrack(newTrackName, CreationCause.INTERNAL).join()) {
Message.CREATE_TRACK_ERROR.send(sender);
return CommandResult.FAILURE;
}
Track newTrack = plugin.getTrackManager().getIfLoaded(newTrackName); Track newTrack = plugin.getTrackManager().getIfLoaded(newTrackName);
if (newTrack == null) { if (newTrack == null) {

2
common/src/main/java/me/lucko/luckperms/common/constants/Message.java
View File

@ -122,7 +122,7 @@ public enum Message {
CREATE_SUCCESS("&b{0}&a was successfully created.", true), CREATE_SUCCESS("&b{0}&a was successfully created.", true),
DELETE_SUCCESS("&b{0}&a was successfully deleted.", true), DELETE_SUCCESS("&b{0}&a was successfully deleted.", true),
RENAME_SUCCESS("&b{0}&a was successfully renamed to &b{1}&a.", true), RENAME_SUCCESS("&b{0}&a was successfully renamed to &b{1}&a.", true),
CLONE_SUCCESS("&b{0}&a was successfully cloned to &b{1}&a.", true), CLONE_SUCCESS("&b{0}&a was successfully cloned onto &b{1}&a.", true),
ALREADY_INHERITS("{0} already inherits '{1}'.", true), ALREADY_INHERITS("{0} already inherits '{1}'.", true),
DOES_NOT_INHERIT("{0} does not inherit '{1}'.", true), DOES_NOT_INHERIT("{0} does not inherit '{1}'.", true),

2
default-lang.yml
View File

@ -76,7 +76,7 @@ check-result: "&aPermission check result on user &b{0}&a for permission &b{1}&a:
create-success: "&b{0}&a was successfully created." create-success: "&b{0}&a was successfully created."
delete-success: "&b{0}&a was successfully deleted." delete-success: "&b{0}&a was successfully deleted."
rename-success: "&b{0}&a was successfully renamed to &b{1}&a." rename-success: "&b{0}&a was successfully renamed to &b{1}&a."
clone-success: "&b{0}&a was successfully cloned to &b{1}&a." clone-success: "&b{0}&a was successfully cloned onto &b{1}&a."
already-inherits: "{0} already inherits '{1}'." already-inherits: "{0} already inherits '{1}'."
does-not-inherit: "{0} does not inherit '{1}'." does-not-inherit: "{0} does not inherit '{1}'."