Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-12-02 23:53:25 +01:00
Code Issues Projects Releases Wiki Activity

Don't publish/broadcast log entries from the import process - towards #317

Browse Source
This commit is contained in:
Luck 2017-09-04 20:47:45 +01:00
parent 03f342a21c
commit dadd8e2c50
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/me/lucko/luckperms/common/actionlog/LogDispatcher.java
View File

@ -45,10 +45,16 @@ public class LogDispatcher {
private final LuckPermsPlugin plugin; private final LuckPermsPlugin plugin;
public void dispatch(LogEntry entry, Sender sender) { 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); plugin.getStorage().logAction(entry);
} }
// don't dispatch log entries sent by an import process
if (sender.isImport()) {
return;
}
InternalMessagingService messagingService = plugin.getMessagingService(); InternalMessagingService messagingService = plugin.getMessagingService();
if (!sender.isImport() && !(messagingService instanceof NoopMessagingService)) { if (!sender.isImport() && !(messagingService instanceof NoopMessagingService)) {
messagingService.pushLog(entry); messagingService.pushLog(entry);

3
common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java
View File

@ -134,7 +134,8 @@ public final class AbstractSender<T> implements Sender {
@Override @Override
public boolean isImport() { public boolean isImport() {
return this.uuid.equals(Constants.IMPORT_UUID); // the importer uses it's own instance of Sender
return false;
} }
@Override @Override