From 810e61f0e278af16c1bc06d1c18f4239fd34594e Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Wed, 9 Feb 2022 14:40:27 +0100 Subject: [PATCH] Bugfix in '/t2code debug createReportLog' --- pom.xml | 2 +- .../lib/Spigot/system/CreateReportLog.java | 20 ++++++++------ .../net/t2code/lib/Spigot/system/Main.java | 26 ++++++++++-------- target/classes/bungee.yml | 2 +- .../lib/Spigot/system/CreateReportLog.class | Bin 10061 -> 10196 bytes .../net/t2code/lib/Spigot/system/Main.class | Bin 6950 -> 6976 bytes target/classes/plugin.yml | 2 +- 7 files changed, 29 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 91e3475..b5563fb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 11.0 + 11.1 jar T2CodeLib diff --git a/src/main/java/net/t2code/lib/Spigot/system/CreateReportLog.java b/src/main/java/net/t2code/lib/Spigot/system/CreateReportLog.java index d401b1c..40c7da0 100644 --- a/src/main/java/net/t2code/lib/Spigot/system/CreateReportLog.java +++ b/src/main/java/net/t2code/lib/Spigot/system/CreateReportLog.java @@ -8,6 +8,7 @@ import net.t2code.lib.Spigot.Lib.vault.Vault; import net.t2code.luckyBox.api.LuckyBoxAPI; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; +import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -44,21 +45,24 @@ public class CreateReportLog { pWriter.println("Online Mode: " + Bukkit.getOnlineMode()); pWriter.println("Worlds: " + Bukkit.getWorlds()); pWriter.println("OP-Player:"); - for (OfflinePlayer player : Bukkit.getOperators()){ - pWriter.println(" - Player: " +player.getName() + " - " + player.getUniqueId()); + for (OfflinePlayer player : Bukkit.getOperators()) { + pWriter.println(" - Player: " + player.getName() + " - " + player.getUniqueId()); } pWriter.println(); if (Vault.vaultEnable) { pWriter.println("Vault: " + Bukkit.getPluginManager().getPlugin("Vault").getName() + " - " + Bukkit.getPluginManager().getPlugin("Vault").getDescription().getVersion()); } else pWriter.println("Vault: not connected"); if (Main.eco != null) { - String st; - st = Main.eco.getName(); + String st = Main.eco.getName(); if (Main.eco.getName().equals("CMIEconomy")) st = "CMI"; - pWriter.println("Economy: " + Main.eco.isEnabled() + " - " + Main.eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion()); + if (Bukkit.getPluginManager().getPlugin(st) != null) { + pWriter.println("Economy: " + Main.eco.isEnabled() + " - " + st + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion()); + } else pWriter.println("Economy: " + Main.eco.isEnabled() + " - " + st); } else pWriter.println("Economy: not connected via vault"); if (Main.perm != null) { - pWriter.println("Permission: " + Main.perm.isEnabled() + " - " + Main.perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(Main.perm.getName()).getDescription().getVersion()); + if (Bukkit.getPluginManager().getPlugin(Main.perm.getName()) != null) { + pWriter.println("Permission: " + Main.perm.isEnabled() + " - " + Main.perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(Main.perm.getName()).getDescription().getVersion()); + } else pWriter.println("Permission: " + Main.perm.isEnabled() + " - " + Main.perm.getName()); } else pWriter.println("Permission: not connected via vault"); pWriter.println(); pWriter.println("Java: " + System.getProperty("java.version")); @@ -68,7 +72,7 @@ public class CreateReportLog { pWriter.println(); pWriter.println("T2CodeLib: " + Main.plugin.getDescription().getVersion()); pWriter.println(); - if (PluginCheck.luckyBox()){ + if (PluginCheck.luckyBox()) { pWriter.println("T2C-PremiumPlugins: "); pWriter.println("T2C-LuckyBox UID: " + LuckyBoxAPI.getUID()); pWriter.println("T2C-LuckyBox RID: " + LuckyBoxAPI.getRID()); @@ -185,7 +189,7 @@ public class CreateReportLog { while ((len = in.read(buf)) > 0) { try { zip.write(buf, 0, len); - } catch (Exception ex){ + } catch (Exception ex) { ex.printStackTrace(); } } diff --git a/src/main/java/net/t2code/lib/Spigot/system/Main.java b/src/main/java/net/t2code/lib/Spigot/system/Main.java index c933349..18e4381 100644 --- a/src/main/java/net/t2code/lib/Spigot/system/Main.java +++ b/src/main/java/net/t2code/lib/Spigot/system/Main.java @@ -47,10 +47,11 @@ public final class Main extends JavaPlugin { plugin = this; autor = plugin.getDescription().getAuthors(); version = plugin.getDescription().getVersion(); - Long long_; + long long_; long_ = T2CodeTemplate.onLoadHeader(prefix, autor, version, spigot, discord); if (Util.getSnapshot()){ - send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! §4This is a trial version! §eSome features may not be working as expected. Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!"); + send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! §4This is a trial version! §eSome features may not be working as expected." + + " Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!"); send.console(prefix + " §4 §e-------------------"); try { Thread.sleep(5000); @@ -83,25 +84,26 @@ public final class Main extends JavaPlugin { ItemVersion.scan(); send.console(Main.prefix + " §3Server run on: §6" + MCVersion.isVersion + " / " + NMSVersion.isNMS); if (eco != null) { - String st; - st = eco.getName(); + String st = eco.getName(); if (eco.getName().equals("CMIEconomy")) st = "CMI"; if (Bukkit.getPluginManager().getPlugin(st) != null){ - send.console(Main.prefix + " §3Economy: §6" + eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion() + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else send.console(Main.prefix + " §3Economy: §6" + eco.getName() + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else send.console(Main.prefix + " §3Economy: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); + send.console(Main.prefix + " §3Economy: §6" + eco.getName() + " - " + Bukkit.getPluginManager().getPlugin(st).getDescription().getVersion() + " §7- §e" + + (System.currentTimeMillis() - long_) + "ms"); + } else send.console(Main.prefix + " §3Economy: §6" + eco.getName() + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else send.console(Main.prefix + " §3Economy: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); if (perm != null) { if (Bukkit.getPluginManager().getPlugin(perm.getName()) != null){ - send.console(Main.prefix + " §3Permission plugin: §6" + perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(perm.getName()).getDescription().getVersion() + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else send.console(Main.prefix + " §3Permission plugin: §6" + perm.getName() + " - §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else send.console(Main.prefix + " §3Permission plugin: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); + send.console(Main.prefix + " §3Permission plugin: §6" + perm.getName() + " - " + Bukkit.getPluginManager().getPlugin(perm.getName()).getDescription().getVersion() + + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else send.console(Main.prefix + " §3Permission plugin: §6" + perm.getName() + " - §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + } else send.console(Main.prefix + " §3Permission plugin: §4not connected via vault!" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + if (PluginCheck.pluginCheck("PlaceholderAPI")) { - send.console(Main.prefix + " §3PlaceholderAPI: §6connected" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); + send.console(Main.prefix + " §3PlaceholderAPI: §6connected" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); } - Main.plugin.getCommand("t2code").setExecutor(new CmdExecuter()); ConfigCreate.configCreate(); LanguagesCreate.langCreate(); diff --git a/target/classes/bungee.yml b/target/classes/bungee.yml index dbc00bd..ba3c3f6 100644 --- a/target/classes/bungee.yml +++ b/target/classes/bungee.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 11.0 +version: 11.1 main: net.t2code.lib.Bungee.BMain author: JaTiTV, Jkobs description: Libarie from T2Code Plugins \ No newline at end of file diff --git a/target/classes/net/t2code/lib/Spigot/system/CreateReportLog.class b/target/classes/net/t2code/lib/Spigot/system/CreateReportLog.class index 759aff7ab981c52c6b1ba18269fedca8ff57dc0e..e74a364cce96b605193c593488a38de11ef833d9 100644 GIT binary patch delta 1118 zcmaizdrZ}37{@=)`TgFP!->K%O%4)4gd&2~2}=}B%?k+1Woa@nmB5B|xM<*o@hEGNYe5t7 z7-@??BeFZ(kdTzsNxR=3qSHe+`F{5UqRI{u9e2EgVeNc*h#sMXwQ+5F_S^8$gtSoR zwX!s|gBv?2e*>T2jXR~(&gpKpsFp$pXaCbHy4vadke+(bS}6mv5RxP?kmsV0pzjAk=q*h@NZF_t4_(8DUGaB^{egu;A-67L9$yu!x^6g6L z)d~-lwnEM+IaJ#+IWHG*O`+7v#X*fkQzAjRG&q6@N{RfY6eX9n)gL5=m!t$@`YHX3 zbdT+)GAq)OvP!Zx;-it_Y|@Q+k@31UQ`yQ~woyV84-@7Enw6Spp(QdowN=Kp>b-U_ zjGbh&i(J~6%`3Wkdw7Ib+0N@6)$_N!85y{>LZ-j13h!_O?`r3Ln!2ANA}r(pOF762 eI;rPVd8Ow%_x4zVG`!@AJI-9xD8{ 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 K)!9p-vHt=$N^i{o diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index eb21bd1..c147c58 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 11.0 +version: 11.1 main: net.t2code.lib.Spigot.system.Main api-version: 1.13 prefix: T2CodeLib