From 914235aabb41092bd7e7897cb20d946a2e010cb2 Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Sat, 11 Dec 2021 19:46:35 +0100 Subject: [PATCH] Improve some messages --- .../MarriageMaster/Bukkit/Commands/DebugCommand.java | 10 ++++++---- .../MarriageMaster/Database/BaseDatabase.java | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/DebugCommand.java b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/DebugCommand.java index 4b200a34..8dc6fbae 100644 --- a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/DebugCommand.java +++ b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/DebugCommand.java @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package at.pcgamingfreaks.MarriageMaster.Bukkit.Commands; @@ -59,7 +59,7 @@ public DebugCommand(final @NotNull MarriageMaster plugin) builder = new MessageBuilder("All data has been collected!", MessageColor.GREEN, MessageFormat.BOLD).appendNewLine(); builder.append("You can now interact with your game again.").appendNewLine(); - builder.append("The collected data can be found in your plugins directory inside the 'debug.txt' file.").appendNewLine(); + builder.append("The collected data can be found in your plugins' directory inside the 'debug.txt' file.").appendNewLine(); builder.append("Please upload this fiel to "); builder.append("https://pastebin.com/", MessageColor.YELLOW, MessageFormat.UNDERLINE).onClick(MessageClickEvent.ClickEventAction.OPEN_URL, "https://pastebin.com/"); builder.append(" and send the link to the developer."); @@ -75,8 +75,10 @@ public void execute(@NotNull CommandSender commandSender, @NotNull String mainCo messageStart.send(sender); File debugFile = new File(plugin.getDataFolder(), "debug.txt"); - if(debugFile.exists()) //noinspection ResultOfMethodCallIgnored - debugFile.delete(); + if(debugFile.exists() && !debugFile.delete()) + { + plugin.getLogger().warning("Failed to delete debug.txt file!"); + } writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(debugFile), StandardCharsets.UTF_8)); writer.append(plugin.getDescription().getName()).append(" Version: ").append(plugin.getDescription().getVersion()); diff --git a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/BaseDatabase.java b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/BaseDatabase.java index 5a039891..b3f09845 100644 --- a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/BaseDatabase.java +++ b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/BaseDatabase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 GeorgH93 + * Copyright (C) 2021 GeorgH93 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package at.pcgamingfreaks.MarriageMaster.Database; @@ -101,11 +101,12 @@ public DatabaseBackend getDatabaseBac if(bungeeSupportRequired) { logger.severe("Database type not supported on BungeeCord!"); + db.close(); return null; } if(bungee) { - logger.warning("The used database dose not support multi server setups! Please consider switching to MySQL!"); + logger.warning("The used database does not support multi-server setups! Please consider switching to MySQL!"); } } db.startup();