From 8dbb083b905284e1156355f451333af0b5c04c7b Mon Sep 17 00:00:00 2001 From: Luck Date: Tue, 31 Jan 2017 12:29:06 +0000 Subject: [PATCH] Fix migration log being sent to the console twice --- .../luckperms/bukkit/migration/MigrationBPermissions.java | 4 +++- .../luckperms/bukkit/migration/MigrationGroupManager.java | 4 +++- .../luckperms/bukkit/migration/MigrationPermissionsEx.java | 4 +++- .../luckperms/bukkit/migration/MigrationPowerfulPerms.java | 4 +++- .../luckperms/bukkit/migration/MigrationZPermissions.java | 4 +++- .../luckperms/bungee/migration/MigrationBungeePerms.java | 4 +++- .../luckperms/common/commands/misc/ExportCommand.java | 7 ++++++- .../luckperms/common/commands/sender/AbstractSender.java | 3 ++- .../me/lucko/luckperms/common/commands/sender/Sender.java | 7 +++++++ .../sponge/migration/MigrationPermissionManager.java | 4 +++- .../luckperms/sponge/migration/MigrationPermissionsEx.java | 4 +++- 11 files changed, 39 insertions(+), 10 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java index 59b41351..7e4a1008 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java @@ -180,7 +180,9 @@ public class MigrationBPermissions extends SubCommand { public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) throws CommandException { Consumer log = s -> { Message.MIGRATION_LOG.send(sender, s); - Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + if (!sender.isConsole()) { + Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + } }; log.accept("Starting bPermissions migration."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java index 4a189835..f2ee42d9 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java @@ -64,7 +64,9 @@ public class MigrationGroupManager extends SubCommand { public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) throws CommandException { Consumer log = s -> { Message.MIGRATION_LOG.send(sender, s); - Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + if (!sender.isConsole()) { + Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + } }; log.accept("Starting GroupManager migration."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java index 231332aa..c058c5e7 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java @@ -65,7 +65,9 @@ public class MigrationPermissionsEx extends SubCommand { public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) throws CommandException { Consumer log = s -> { Message.MIGRATION_LOG.send(sender, s); - Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + if (!sender.isConsole()) { + Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + } }; log.accept("Starting PermissionsEx migration."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java index e7137db8..b8b3b32e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java @@ -200,7 +200,9 @@ public class MigrationPowerfulPerms extends SubCommand { private CommandResult run(LuckPermsPlugin plugin, Sender sender, List args) { Consumer log = s -> { Message.MIGRATION_LOG.send(sender, s); - Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + if (!sender.isConsole()) { + Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + } }; log.accept("Starting PowerfulPerms migration."); diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java index da407891..adda5ac9 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java @@ -60,7 +60,9 @@ public class MigrationZPermissions extends SubCommand { public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) throws CommandException { Consumer log = s -> { Message.MIGRATION_LOG.send(sender, s); - Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + if (!sender.isConsole()) { + Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + } }; log.accept("Starting zPermissions migration."); diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java b/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java index 7a390005..fbdf7488 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/migration/MigrationBungeePerms.java @@ -57,7 +57,9 @@ public class MigrationBungeePerms extends SubCommand { public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) throws CommandException { Consumer log = s -> { Message.MIGRATION_LOG.send(sender, s); - Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + if (!sender.isConsole()) { + Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + } }; log.accept("Starting BungeePerms migration."); diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java index b3f586e9..c0aaa98e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java @@ -110,7 +110,12 @@ public class ExportCommand extends SingleCommand { @Override public CommandResult execute(LuckPermsPlugin plugin, Sender sender, List args, String label) { - Consumer log = s -> Message.EXPORT_LOG.send(sender, s); + Consumer log = s -> { + Message.EXPORT_LOG.send(sender, s); + if (!sender.isConsole()) { + Message.EXPORT_LOG.send(plugin.getConsoleSender(), s); + } + }; File f = new File(plugin.getDataDirectory(), args.get(0)); if (f.exists()) { diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java b/common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java index 83d4f365..2759d650 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java @@ -86,7 +86,8 @@ public class AbstractSender implements Sender { return false; } - private boolean isConsole() { + @Override + public boolean isConsole() { return this.uuid.equals(Constants.CONSOLE_UUID) || this.uuid.equals(Constants.IMPORT_UUID); } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/sender/Sender.java b/common/src/main/java/me/lucko/luckperms/common/commands/sender/Sender.java index 99fc648a..4958024c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/sender/Sender.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/sender/Sender.java @@ -78,4 +78,11 @@ public interface Sender { */ boolean hasPermission(Permission permission); + /** + * Gets whether this sender is the console + * + * @return if the sender is the console + */ + boolean isConsole(); + } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java index f35add7d..5388a104 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java @@ -57,7 +57,9 @@ public class MigrationPermissionManager extends SubCommand { public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) throws CommandException { Consumer log = s -> { Message.MIGRATION_LOG.send(sender, s); - Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + if (!sender.isConsole()) { + Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + } }; log.accept("Starting PermissionManager migration."); diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java b/sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java index 970d38fc..5f472a52 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java @@ -64,7 +64,9 @@ public class MigrationPermissionsEx extends SubCommand { public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List args, String label) throws CommandException { Consumer log = s -> { Message.MIGRATION_LOG.send(sender, s); - Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + if (!sender.isConsole()) { + Message.MIGRATION_LOG.send(plugin.getConsoleSender(), s); + } }; log.accept("Starting PermissionsEx migration.");