From e73992b8ed1c40e8695fd2fb0c9c1a0aff15edd7 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 21 Jul 2020 09:51:47 +1200 Subject: [PATCH] Fix a check --- .../commands/libsdisguises/LDUploadLogs.java | 12 ++++++++++-- .../disguise/utilities/LibsPremium.java | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java b/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java index 5acceeb6..74a0df23 100644 --- a/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java +++ b/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java @@ -18,6 +18,7 @@ import java.net.URL; import java.net.URLEncoder; import java.nio.file.Files; import java.util.AbstractMap.SimpleEntry; +import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -179,12 +180,19 @@ public class LDUploadLogs implements LDCommand { String disguiseText = new String(Files.readAllBytes(disguises.toPath())); StringBuilder configText = new StringBuilder(new String(Files.readAllBytes(config.toPath()))); - configText.append("\n\n"); + configText.append("\n================\n"); - for (String s : DisguiseConfig.doOutput(LibsDisguises.getInstance().getConfig(), true, true)) { + ArrayList modified = DisguiseConfig + .doOutput(LibsDisguises.getInstance().getConfig(), true, true); + + for (String s : modified) { configText.append("\n").append(s); } + if (modified.isEmpty()) { + configText.append("\nUsing default config!"); + } + URL latestPaste = new GuestPaste("latest.log", latestText).paste(); URL configPaste = new GuestPaste("LibsDisguises config.yml", configText.toString()).paste(); URL disguisesPaste = new GuestPaste("LibsDisguises disguises.yml", disguiseText).paste(); diff --git a/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java b/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java index 5c56e68c..452a0304 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java @@ -223,8 +223,8 @@ public class LibsPremium { DisguiseUtilities.getLogger().info("Registered to: " + getSanitizedUser(plugin.getUserID())); // >.> - if (plugin.getBuildNumber() == null || !plugin.getBuildNumber().matches("[0-9]+") || - Integer.parseInt(plugin.getBuildNumber()) < 300) { + if (plugin.getBuildNumber() == null || !plugin.getBuildNumber().matches("#[0-9]+") || + Integer.parseInt(plugin.getBuildNumber().substring(1)) < 300) { file.delete(); continue; }