worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few small fixes

Browse Source
This commit is contained in:
Luck
2016-08-20 17:49:23 +01:00
Unverified
parent 471084a9ef
commit bbeed1e4ed
36 changed files with 108 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/me/lucko/luckperms/commands/SenderFactory.java
+12 -9
View File
@@ -34,9 +34,8 @@ import java.util.stream.Collectors;
* @param <T> the command sender type
*/
public abstract class SenderFactory<T> implements Runnable {
// Ensures messages are sent in order, etc.
private final List<Runnable> tasks = new ArrayList<>();
private final Map<T, List<String>> messages = new HashMap<>();
//private final List<Map.Entry<T, String>> messages = new ArrayList<>();
private final SenderFactory<T> factory = this;
protected abstract String getName(T t);
@@ -63,8 +62,12 @@ public abstract class SenderFactory<T> implements Runnable {
public void sendMessage(String s) {
final T t = tRef.get();
if (t != null) {
synchronized (tasks) {
tasks.add(() -> factory.sendMessage(t, s));
synchronized (messages) {
if (!messages.containsKey(t)) {
messages.put(t, new ArrayList<>());
}
messages.get(t).add(s);
}
}
}
@@ -80,10 +83,10 @@ public abstract class SenderFactory<T> implements Runnable {
@Override
public final void run() {
synchronized (tasks) {
if (!tasks.isEmpty()) {
tasks.forEach(Runnable::run);
tasks.clear();
synchronized (messages) {
if (!messages.isEmpty()) {
messages.entrySet().forEach(e -> e.getValue().forEach(s -> factory.sendMessage(e.getKey(), s)));
messages.clear();
}
}
}
common/src/main/java/me/lucko/luckperms/commands/group/CreateGroup.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class CreateGroup extends SingleMainCommand {
}
Message.CREATE_SUCCESS.send(sender, groupName);
LogEntry.build().actor(sender).actedName(groupName).type('G').action("create").build().submit(plugin);
LogEntry.build().actor(sender).actedName(groupName).type('G').action("create").build().submit(plugin, sender);
plugin.runUpdateTask();
return CommandResult.SUCCESS;
}
common/src/main/java/me/lucko/luckperms/commands/group/DeleteGroup.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class DeleteGroup extends SingleMainCommand {
}
Message.DELETE_SUCCESS.send(sender, groupName);
LogEntry.build().actor(sender).actedName(groupName).type('G').action("delete").build().submit(plugin);
LogEntry.build().actor(sender).actedName(groupName).type('G').action("delete").build().submit(plugin, sender);
plugin.runUpdateTask();
return CommandResult.SUCCESS;
}
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class GroupClear extends SubCommand<Group> {
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Group group, List<String> args, String label) {
group.clearNodes();
Message.CLEAR_SUCCESS.send(sender, group.getName());
LogEntry.build().actor(sender).acted(group).action("clear").build().submit(plugin);
LogEntry.build().actor(sender).acted(group).action("clear").build().submit(plugin, sender);
save(group, sender, plugin);
return CommandResult.SUCCESS;
}
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java
+3 -3
View File
@@ -76,14 +76,14 @@ public class GroupSetInherit extends SubCommand<Group> {
Message.GROUP_SETINHERIT_SERVER_SUCCESS.send(sender, group.getName(), group1.getName(), server);
LogEntry.build().actor(sender).acted(group)
.action("setinherit " + group1.getName() + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
group.setInheritGroup(group1, server, world);
Message.GROUP_SETINHERIT_SERVER_WORLD_SUCCESS.send(sender, group.getName(), group1.getName(), server, world);
LogEntry.build().actor(sender).acted(group)
.action("setinherit " + group1.getName() + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -91,7 +91,7 @@ public class GroupSetInherit extends SubCommand<Group> {
Message.GROUP_SETINHERIT_SUCCESS.send(sender, group.getName(), group1.getName());
LogEntry.build().actor(sender).acted(group)
.action("setinherit " + group1.getName())
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(group, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java
+3 -3
View File
@@ -78,14 +78,14 @@ public class GroupSetPermission extends SubCommand<Group> {
Message.SETPERMISSION_SERVER_SUCCESS.send(sender, node, bool, group.getName(), server);
LogEntry.build().actor(sender).acted(group)
.action("set " + node + " " + b + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(3).toLowerCase();
group.setPermission(node, b, server, world);
Message.SETPERMISSION_SERVER_WORLD_SUCCESS.send(sender, node, bool, group.getName(), server, world);
LogEntry.build().actor(sender).acted(group)
.action("set " + node + " " + b + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -93,7 +93,7 @@ public class GroupSetPermission extends SubCommand<Group> {
Message.SETPERMISSION_SUCCESS.send(sender, node, bool, group.getName());
LogEntry.build().actor(sender).acted(group)
.action("set " + node + " " + b)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(group, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java
+3 -3
View File
@@ -95,7 +95,7 @@ public class GroupSetTempInherit extends SubCommand<Group> {
DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(group)
.action("settempinherit " + group1.getName() + " " + duration + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(3).toLowerCase();
group.setInheritGroup(group1, server, world, duration);
@@ -103,7 +103,7 @@ public class GroupSetTempInherit extends SubCommand<Group> {
world, DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(group)
.action("settempinherit " + group1.getName() + " " + duration + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -111,7 +111,7 @@ public class GroupSetTempInherit extends SubCommand<Group> {
Message.GROUP_SET_TEMP_INHERIT_SUCCESS.send(sender, group.getName(), group1.getName(), DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(group)
.action("settempinherit " + group1.getName() + " " + duration)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(group, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java
+3 -3
View File
@@ -98,7 +98,7 @@ public class GroupSetTempPermission extends SubCommand<Group> {
DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(group)
.action("settemp " + node + " " + b + " " + duration + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(4).toLowerCase();
group.setPermission(node, b, server, world, duration);
@@ -106,7 +106,7 @@ public class GroupSetTempPermission extends SubCommand<Group> {
world, DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(group)
.action("settemp " + node + " " + b + " " + duration + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -114,7 +114,7 @@ public class GroupSetTempPermission extends SubCommand<Group> {
Message.SETPERMISSION_TEMP_SUCCESS.send(sender, node, bool, group.getName(), DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(group)
.action("settemp " + node + " " + b + " " + duration)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(group, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java
+3 -3
View File
@@ -70,14 +70,14 @@ public class GroupUnSetPermission extends SubCommand<Group> {
Message.UNSETPERMISSION_SERVER_SUCCESS.send(sender, node, group.getName(), server);
LogEntry.build().actor(sender).acted(group)
.action("unset " + node + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
group.unsetPermission(node, server, world);
Message.UNSETPERMISSION_SERVER_WORLD_SUCCESS.send(sender, node, group.getName(), server, world);
LogEntry.build().actor(sender).acted(group)
.action("unset " + node + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -85,7 +85,7 @@ public class GroupUnSetPermission extends SubCommand<Group> {
Message.UNSETPERMISSION_SUCCESS.send(sender, node, group.getName());
LogEntry.build().actor(sender).acted(group)
.action("unset " + node)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(group, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java
+3 -3
View File
@@ -65,14 +65,14 @@ public class GroupUnsetInherit extends SubCommand<Group> {
Message.GROUP_UNSETINHERIT_SERVER_SUCCESS.send(sender, group.getName(), groupName, server);
LogEntry.build().actor(sender).acted(group)
.action("unsetinherit " + groupName + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
group.unsetPermission("group." + groupName, server, world);
Message.GROUP_UNSETINHERIT_SERVER_WORLD_SUCCESS.send(sender, group.getName(), groupName, server, world);
LogEntry.build().actor(sender).acted(group)
.action("unsetinherit " + groupName + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -80,7 +80,7 @@ public class GroupUnsetInherit extends SubCommand<Group> {
Message.GROUP_UNSETINHERIT_SUCCESS.send(sender, group.getName(), groupName);
LogEntry.build().actor(sender).acted(group)
.action("unsetinherit " + groupName)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(group, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java
+3 -3
View File
@@ -65,14 +65,14 @@ public class GroupUnsetTempInherit extends SubCommand<Group> {
Message.GROUP_UNSET_TEMP_INHERIT_SERVER_SUCCESS.send(sender, group.getName(), groupName, server);
LogEntry.build().actor(sender).acted(group)
.action("unsettempinherit " + groupName + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
group.unsetPermission("group." + groupName, server, world, true);
Message.GROUP_UNSET_TEMP_INHERIT_SERVER_WORLD_SUCCESS.send(sender, group.getName(), groupName, server, world);
LogEntry.build().actor(sender).acted(group)
.action("unsettempinherit " + groupName + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -80,7 +80,7 @@ public class GroupUnsetTempInherit extends SubCommand<Group> {
Message.GROUP_UNSET_TEMP_INHERIT_SUCCESS.send(sender, group.getName(), groupName);
LogEntry.build().actor(sender).acted(group)
.action("unsettempinherit " + groupName)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(group, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java
+3 -3
View File
@@ -71,14 +71,14 @@ public class GroupUnsetTempPermission extends SubCommand<Group> {
Message.UNSET_TEMP_PERMISSION_SERVER_SUCCESS.send(sender, node, group.getName(), server);
LogEntry.build().actor(sender).acted(group)
.action("unsettemp " + node + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
group.unsetPermission(node, server, world);
Message.UNSET_TEMP_PERMISSION_SERVER_WORLD_SUCCESS.send(sender, node, group.getName(), server, world);
LogEntry.build().actor(sender).acted(group)
.action("unsettemp " + node + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -86,7 +86,7 @@ public class GroupUnsetTempPermission extends SubCommand<Group> {
Message.UNSET_TEMP_PERMISSION_SUCCESS.send(sender, node, group.getName());
LogEntry.build().actor(sender).acted(group)
.action("unsettemp " + node)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(group, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class LogGroupHistory extends SubCommand<Log> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Log log, List<String> args, String label) {
String group = args.get(0);
String group = args.get(0).toLowerCase();
int page = -999;
if (args.size() == 2) {
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class LogTrackHistory extends SubCommand<Log> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Log log, List<String> args, String label) {
String track = args.get(0);
String track = args.get(0).toLowerCase();
int page = -999;
if (args.size() == 2) {
common/src/main/java/me/lucko/luckperms/commands/track/CreateTrack.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class CreateTrack extends SingleMainCommand {
}
Message.CREATE_SUCCESS.send(sender, trackName);
LogEntry.build().actor(sender).actedName(trackName).type('T').action("create").build().submit(plugin);
LogEntry.build().actor(sender).actedName(trackName).type('T').action("create").build().submit(plugin, sender);
plugin.runUpdateTask();
return CommandResult.SUCCESS;
}
common/src/main/java/me/lucko/luckperms/commands/track/DeleteTrack.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class DeleteTrack extends SingleMainCommand {
}
Message.DELETE_SUCCESS.send(sender, trackName);
LogEntry.build().actor(sender).actedName(trackName).type('T').action("delete").build().submit(plugin);
LogEntry.build().actor(sender).actedName(trackName).type('T').action("delete").build().submit(plugin, sender);
plugin.runUpdateTask();
return CommandResult.SUCCESS;
}
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java
+4 -2
View File
@@ -63,10 +63,12 @@ public class TrackAppend extends SubCommand<Track> {
try {
track.appendGroup(group);
Message.TRACK_APPEND_SUCCESS.send(sender, group.getName(), track.getName());
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups(), group.getName()));
if (track.getGroups().size() > 1) {
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups(), group.getName()));
}
LogEntry.build().actor(sender).acted(track)
.action("append " + group.getName())
.build().submit(plugin);
.build().submit(plugin, sender);
save(track, sender, plugin);
return CommandResult.SUCCESS;
} catch (ObjectAlreadyHasException e) {
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class TrackClear extends SubCommand<Track> {
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Track track, List<String> args, String label) {
track.clearGroups();
Message.TRACK_CLEAR.send(sender, track.getName());
LogEntry.build().actor(sender).acted(track).action("clear").build().submit(plugin);
LogEntry.build().actor(sender).acted(track).action("clear").build().submit(plugin, sender);
save(track, sender, plugin);
return CommandResult.SUCCESS;
}
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java
+4 -2
View File
@@ -71,10 +71,12 @@ public class TrackInsert extends SubCommand<Track> {
try {
track.insertGroup(group, pos - 1);
Message.TRACK_INSERT_SUCCESS.send(sender, group.getName(), track.getName(), pos);
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups(), group.getName()));
if (track.getGroups().size() > 1) {
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups(), group.getName()));
}
LogEntry.build().actor(sender).acted(track)
.action("insert " + group.getName() + " " + pos)
.build().submit(plugin);
.build().submit(plugin, sender);
save(track, sender, plugin);
return CommandResult.SUCCESS;
} catch (ObjectAlreadyHasException e) {
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java
+4 -2
View File
@@ -51,10 +51,12 @@ public class TrackRemove extends SubCommand<Track> {
try {
track.removeGroup(groupName);
Message.TRACK_REMOVE_SUCCESS.send(sender, groupName, track.getName());
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups()));
if (track.getGroups().size() > 1) {
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups()));
}
LogEntry.build().actor(sender).acted(track)
.action("remove " + groupName)
.build().submit(plugin);
.build().submit(plugin, sender);
save(track, sender, plugin);
return CommandResult.SUCCESS;
} catch (ObjectLacksException e) {
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java
+3 -3
View File
@@ -76,14 +76,14 @@ public class UserAddGroup extends SubCommand<User> {
Message.USER_ADDGROUP_SERVER_SUCCESS.send(sender, user.getName(), groupName, server);
LogEntry.build().actor(sender).acted(user)
.action("addgroup " + group.getName() + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
user.addGroup(group, server, world);
Message.USER_ADDGROUP_SERVER_WORLD_SUCCESS.send(sender, user.getName(), groupName, server, world);
LogEntry.build().actor(sender).acted(user)
.action("addgroup " + group.getName() + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -91,7 +91,7 @@ public class UserAddGroup extends SubCommand<User> {
Message.USER_ADDGROUP_SUCCESS.send(sender, user.getName(), groupName);
LogEntry.build().actor(sender).acted(user)
.action("addgroup " + group.getName())
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(user, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java
+3 -3
View File
@@ -96,7 +96,7 @@ public class UserAddTempGroup extends SubCommand<User> {
DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(user)
.action("addtempgroup " + group.getName() + " " + duration + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(3).toLowerCase();
user.addGroup(group, server, world, duration);
@@ -104,7 +104,7 @@ public class UserAddTempGroup extends SubCommand<User> {
world, DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(user)
.action("addtempgroup " + group.getName() + " " + duration + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -112,7 +112,7 @@ public class UserAddTempGroup extends SubCommand<User> {
Message.USER_ADDTEMPGROUP_SUCCESS.send(sender, user.getName(), groupName, DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(user)
.action("addtempgroup " + group.getName() + " " + duration)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(user, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class UserClear extends SubCommand<User> {
user.clearNodes();
plugin.getUserManager().giveDefaults(user);
Message.CLEAR_SUCCESS.send(sender, user.getName());
LogEntry.build().actor(sender).acted(user).action("clear").build().submit(plugin);
LogEntry.build().actor(sender).acted(user).action("clear").build().submit(plugin, sender);
save(user, sender, plugin);
return CommandResult.SUCCESS;
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java
+1 -1
View File
@@ -108,7 +108,7 @@ public class UserDemote extends SubCommand<User> {
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups(), previousGroup.getName(), old, true));
LogEntry.build().actor(sender).acted(user)
.action("demote " + track.getName() + "(from " + old + " to " + previousGroup.getName() + ")")
.build().submit(plugin);
.build().submit(plugin, sender);
save(user, sender, plugin);
plugin.getApiProvider().fireEventAsync(new UserDemoteEvent(new TrackLink(track), new UserLink(user), old, previousGroup.getName()));
return CommandResult.SUCCESS;
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java
+1 -1
View File
@@ -108,7 +108,7 @@ public class UserPromote extends SubCommand<User> {
Message.EMPTY.send(sender, Util.listToArrowSep(track.getGroups(), old, nextGroup.getName(), false));
LogEntry.build().actor(sender).acted(user)
.action("promote " + track.getName() + "(from " + old + " to " + nextGroup.getName() + ")")
.build().submit(plugin);
.build().submit(plugin, sender);
save(user, sender, plugin);
plugin.getApiProvider().fireEventAsync(new UserPromoteEvent(new TrackLink(track), new UserLink(user), old, nextGroup.getName()));
return CommandResult.SUCCESS;
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java
+3 -3
View File
@@ -70,14 +70,14 @@ public class UserRemoveGroup extends SubCommand<User> {
Message.USER_REMOVEGROUP_SERVER_SUCCESS.send(sender, user.getName(), groupName, server);
LogEntry.build().actor(sender).acted(user)
.action("removegroup " + groupName + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
user.unsetPermission("group." + groupName, server, world);
Message.USER_REMOVEGROUP_SERVER_WORLD_SUCCESS.send(sender, user.getName(), groupName, server, world);
LogEntry.build().actor(sender).acted(user)
.action("removegroup " + groupName + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -85,7 +85,7 @@ public class UserRemoveGroup extends SubCommand<User> {
Message.USER_REMOVEGROUP_SUCCESS.send(sender, user.getName(), groupName);
LogEntry.build().actor(sender).acted(user)
.action("removegroup " + groupName)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(user, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java
+3 -3
View File
@@ -65,14 +65,14 @@ public class UserRemoveTempGroup extends SubCommand<User> {
Message.USER_REMOVETEMPGROUP_SERVER_SUCCESS.send(sender, user.getName(), groupName, server);
LogEntry.build().actor(sender).acted(user)
.action("removetempgroup " + groupName + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
user.unsetPermission("group." + groupName, server, world, true);
Message.USER_REMOVETEMPGROUP_SERVER_WORLD_SUCCESS.send(sender, user.getName(), groupName, server, world);
LogEntry.build().actor(sender).acted(user)
.action("removetempgroup " + groupName + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -80,7 +80,7 @@ public class UserRemoveTempGroup extends SubCommand<User> {
Message.USER_REMOVETEMPGROUP_SUCCESS.send(sender, user.getName(), groupName);
LogEntry.build().actor(sender).acted(user)
.action("removetempgroup " + groupName)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(user, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java
+3 -3
View File
@@ -79,14 +79,14 @@ public class UserSetPermission extends SubCommand<User> {
Message.SETPERMISSION_SERVER_SUCCESS.send(sender, node, bool, user.getName(), server);
LogEntry.build().actor(sender).acted(user)
.action("set " + node + " " + b + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(3).toLowerCase();
user.setPermission(node, b, server, world);
Message.SETPERMISSION_SERVER_WORLD_SUCCESS.send(sender, node, bool, user.getName(), server, world);
LogEntry.build().actor(sender).acted(user)
.action("set " + node + " " + b + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -94,7 +94,7 @@ public class UserSetPermission extends SubCommand<User> {
Message.SETPERMISSION_SUCCESS.send(sender, node, bool, user.getName());
LogEntry.build().actor(sender).acted(user)
.action("set " + node + " " + b)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(user, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class UserSetPrimaryGroup extends SubCommand<User> {
Message.USER_PRIMARYGROUP_SUCCESS.send(sender, user.getName(), group.getName());
LogEntry.build().actor(sender).acted(user)
.action("setprimarygroup " + group.getName())
.build().submit(plugin);
.build().submit(plugin, sender);
save(user, sender, plugin);
return CommandResult.SUCCESS;
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java
+3 -3
View File
@@ -97,14 +97,14 @@ public class UserSetTempPermission extends SubCommand<User> {
Message.SETPERMISSION_TEMP_SERVER_SUCCESS.send(sender, node, bool, user.getName(), server, DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(user)
.action("settemp " + node + " " + b + " " + duration + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(4).toLowerCase();
user.setPermission(node, b, server, world, duration);
Message.SETPERMISSION_TEMP_SERVER_WORLD_SUCCESS.send(sender, node, bool, user.getName(), server, world, DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(user)
.action("settemp " + node + " " + b + " " + duration + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -112,7 +112,7 @@ public class UserSetTempPermission extends SubCommand<User> {
Message.SETPERMISSION_TEMP_SUCCESS.send(sender, node, bool, user.getName(), DateUtil.formatDateDiff(duration));
LogEntry.build().actor(sender).acted(user)
.action("settemp " + node + " " + b + " " + duration)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(user, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java
+3 -3
View File
@@ -70,14 +70,14 @@ public class UserUnSetPermission extends SubCommand<User> {
Message.UNSETPERMISSION_SERVER_SUCCESS.send(sender, node, user.getName(), server);
LogEntry.build().actor(sender).acted(user)
.action("unset " + node + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
user.unsetPermission(node, server, world);
Message.UNSETPERMISSION_SERVER_WORLD_SUCCESS.send(sender, node, user.getName(), server, world);
LogEntry.build().actor(sender).acted(user)
.action("unset " + node + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -85,7 +85,7 @@ public class UserUnSetPermission extends SubCommand<User> {
Message.UNSETPERMISSION_SUCCESS.send(sender, node, user.getName());
LogEntry.build().actor(sender).acted(user)
.action("unset " + node)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(user, sender, plugin);
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java
+3 -3
View File
@@ -71,14 +71,14 @@ public class UserUnsetTempPermission extends SubCommand<User> {
Message.UNSET_TEMP_PERMISSION_SERVER_SUCCESS.send(sender, node, user.getName(), server);
LogEntry.build().actor(sender).acted(user)
.action("unsettemp " + node + " " + server)
.build().submit(plugin);
.build().submit(plugin, sender);
} else {
final String world = args.get(2).toLowerCase();
user.unsetPermission(node, server, world, true);
Message.UNSET_TEMP_PERMISSION_SERVER_WORLD_SUCCESS.send(sender, node, user.getName(), server, world);
LogEntry.build().actor(sender).acted(user)
.action("unsettemp " + node + " " + server + " " + world)
.build().submit(plugin);
.build().submit(plugin, sender);
}
} else {
@@ -86,7 +86,7 @@ public class UserUnsetTempPermission extends SubCommand<User> {
Message.UNSET_TEMP_PERMISSION_SUCCESS.send(sender, node, user.getName());
LogEntry.build().actor(sender).acted(user)
.action("unsettemp " + node)
.build().submit(plugin);
.build().submit(plugin, sender);
}
save(user, sender, plugin);
common/src/main/java/me/lucko/luckperms/core/PermissionHolder.java
+3 -5
View File
@@ -332,9 +332,8 @@ public abstract class PermissionHolder {
builder.append("/");
} else {
if (world != null) {
builder.append("global-").append(world);
builder.append("global-").append(world).append("/");
}
builder.append("/");
}
builder.append(node);
@@ -346,7 +345,7 @@ public abstract class PermissionHolder {
final String finalNode = builder.toString();
if (hasPermission(node, value)) {
if (hasPermission(finalNode, value)) {
throw new ObjectAlreadyHasException();
}
@@ -431,9 +430,8 @@ public abstract class PermissionHolder {
builder.append("/");
} else {
if (world != null) {
builder.append("global-").append(world);
builder.append("global-").append(world).append("/");
}
builder.append("/");
}
builder.append(node);
common/src/main/java/me/lucko/luckperms/data/LogEntry.java
+2 -1
View File
@@ -44,7 +44,7 @@ public class LogEntry extends me.lucko.luckperms.api.LogEntry {
super();
}
public void submit(LuckPermsPlugin plugin) {
public void submit(LuckPermsPlugin plugin, Sender sender) {
plugin.getDatastore().logAction(this);
LogNotifyEvent event = new LogNotifyEvent(this);
@@ -60,6 +60,7 @@ public class LogEntry extends me.lucko.luckperms.api.LogEntry {
senders.stream()
.filter(s -> !plugin.getIgnoringLogs().contains(s.getUuid()))
.filter(s -> !s.getUuid().equals(sender.getUuid()))
.forEach(s -> Message.LOG.send(s, msg));
}