From 58ab3c325c85c12d848b136c9e0401a9d9e82eea Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 10 Nov 2018 20:20:58 +0000 Subject: [PATCH] misc tidying up --- LICENSE_HEADER.txt => HEADER.txt | 0 build.gradle | 2 +- .../me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java | 4 ++-- .../main/java/me/lucko/luckperms/common/backup/Importer.java | 2 +- .../java/me/lucko/luckperms/common/event/EventFactory.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename LICENSE_HEADER.txt => HEADER.txt (100%) diff --git a/LICENSE_HEADER.txt b/HEADER.txt similarity index 100% rename from LICENSE_HEADER.txt rename to HEADER.txt diff --git a/build.gradle b/build.gradle index 7c185ce8e..2bb8708fc 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ subprojects { project.ext.fullVersion = project.ext.majorVersion + '.' + project.ext.minorVersion + '.' + project.ext.patchVersion license { - header = rootProject.file('LICENSE_HEADER.txt') + header = rootProject.file('HEADER.txt') include '**/*.java' newLine = true } diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java index e3bb653b4..f4a0e6375 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java @@ -96,7 +96,7 @@ public class VaultPermissionHook extends AbstractVaultPermission { } // are we on the main thread? - if (!plugin.getBootstrap().isServerStarting() && Bukkit.isPrimaryThread() && !this.plugin.getConfiguration().get(ConfigKeys.VAULT_UNSAFE_LOOKUPS)) { + if (!this.plugin.getBootstrap().isServerStarting() && Bukkit.isPrimaryThread() && !this.plugin.getConfiguration().get(ConfigKeys.VAULT_UNSAFE_LOOKUPS)) { throw new RuntimeException( "The operation to lookup a UUID for '" + player + "' was cancelled by LuckPerms. This is NOT a bug. \n" + "The lookup request was made on the main server thread. It is not safe to execute a request to \n" + @@ -132,7 +132,7 @@ public class VaultPermissionHook extends AbstractVaultPermission { } // are we on the main thread? - if (!plugin.getBootstrap().isServerStarting() && Bukkit.isPrimaryThread() && !this.plugin.getConfiguration().get(ConfigKeys.VAULT_UNSAFE_LOOKUPS)) { + if (!this.plugin.getBootstrap().isServerStarting() && Bukkit.isPrimaryThread() && !this.plugin.getConfiguration().get(ConfigKeys.VAULT_UNSAFE_LOOKUPS)) { throw new RuntimeException( "The operation to load user data for '" + uuid + "' was cancelled by LuckPerms. This is NOT a bug. \n" + "The lookup request was made on the main server thread. It is not safe to execute a request to \n" + diff --git a/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java b/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java index 448194102..2c5ff2a4c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java +++ b/common/src/main/java/me/lucko/luckperms/common/backup/Importer.java @@ -184,7 +184,7 @@ public class Importer implements Runnable { AtomicInteger errIndex = new AtomicInteger(1); for (ImportCommand e : this.commands) { if (e.getResult() != null && e.getResult().wasFailure()) { - for (Sender s : notify) { + for (Sender s : this.notify) { Message.IMPORT_END_ERROR_HEADER.send(s, errIndex.get(), e.getId(), e.getCommand(), e.getResult().toString()); e.getOutput().forEach(out -> Message.IMPORT_END_ERROR_CONTENT.send(s, out)); Message.IMPORT_END_ERROR_FOOTER.send(s); diff --git a/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java b/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java index 0b61e5eb5..ae36e06e4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java @@ -103,7 +103,7 @@ public final class EventFactory { return this.eventBus; } - private boolean shouldPost(Class eventClass){ + private boolean shouldPost(Class eventClass) { return this.eventBus.shouldPost(eventClass); }