diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java index 5296651b4..2ae492aa3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java @@ -45,10 +45,16 @@ public class LogDispatcher { private final LuckPermsPlugin plugin; public void dispatch(LogEntry entry, Sender sender) { - if (!plugin.getApiProvider().getEventFactory().handleLogPublish(false, entry)) { + // set the event to cancelled if the sender is import + if (!plugin.getApiProvider().getEventFactory().handleLogPublish(sender.isImport(), entry)) { plugin.getStorage().logAction(entry); } + // don't dispatch log entries sent by an import process + if (sender.isImport()) { + return; + } + InternalMessagingService messagingService = plugin.getMessagingService(); if (!sender.isImport() && !(messagingService instanceof NoopMessagingService)) { messagingService.pushLog(entry); 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 1aa9e26d3..f0eb51604 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 @@ -134,7 +134,8 @@ public final class AbstractSender implements Sender { @Override public boolean isImport() { - return this.uuid.equals(Constants.IMPORT_UUID); + // the importer uses it's own instance of Sender + return false; } @Override