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

misc tidying up

Browse Source
This commit is contained in:
Luck 2018-11-10 20:20:58 +00:00
parent 44c8c67803
commit 58ab3c325c
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
LICENSE_HEADER.txt → HEADER.txt
View File

2
build.gradle
View File

@ -52,7 +52,7 @@ subprojects {
project.ext.fullVersion = project.ext.majorVersion + '.' + project.ext.minorVersion + '.' + project.ext.patchVersion project.ext.fullVersion = project.ext.majorVersion + '.' + project.ext.minorVersion + '.' + project.ext.patchVersion
license { license {
header = rootProject.file('LICENSE_HEADER.txt') header = rootProject.file('HEADER.txt')
include '**/*.java' include '**/*.java'
newLine = true newLine = true
} }

4
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java
View File

@ -96,7 +96,7 @@ public class VaultPermissionHook extends AbstractVaultPermission {
} }
// are we on the main thread? // 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( throw new RuntimeException(
"The operation to lookup a UUID for '" + player + "' was cancelled by LuckPerms. This is NOT a bug. \n" + "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" + "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? // 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( throw new RuntimeException(
"The operation to load user data for '" + uuid + "' was cancelled by LuckPerms. This is NOT a bug. \n" + "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" + "The lookup request was made on the main server thread. It is not safe to execute a request to \n" +

2
common/src/main/java/me/lucko/luckperms/common/backup/Importer.java
View File

@ -184,7 +184,7 @@ public class Importer implements Runnable {
AtomicInteger errIndex = new AtomicInteger(1); AtomicInteger errIndex = new AtomicInteger(1);
for (ImportCommand e : this.commands) { for (ImportCommand e : this.commands) {
if (e.getResult() != null && e.getResult().wasFailure()) { 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()); 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)); e.getOutput().forEach(out -> Message.IMPORT_END_ERROR_CONTENT.send(s, out));
Message.IMPORT_END_ERROR_FOOTER.send(s); Message.IMPORT_END_ERROR_FOOTER.send(s);

2
common/src/main/java/me/lucko/luckperms/common/event/EventFactory.java
View File

@ -103,7 +103,7 @@ public final class EventFactory {
return this.eventBus; return this.eventBus;
} }
private boolean shouldPost(Class<? extends LuckPermsEvent> eventClass){ private boolean shouldPost(Class<? extends LuckPermsEvent> eventClass) {
return this.eventBus.shouldPost(eventClass); return this.eventBus.shouldPost(eventClass);
} }