Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-01-26 09:31:29 +01:00
Code Issues Projects Releases Wiki Activity

Output server details if AuthMe stops because of server type (#1946)

Browse Source
This commit is contained in:
ljacqu 2019-12-08 20:11:23 +01:00
parent e1106a7eb0
commit 442737c27c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -32,7 +32,6 @@ import fr.xephi.authme.settings.properties.SecuritySettings;
import fr.xephi.authme.task.CleanupTask; import fr.xephi.authme.task.CleanupTask;
import fr.xephi.authme.task.purge.PurgeService; import fr.xephi.authme.task.purge.PurgeService;
import fr.xephi.authme.util.ExceptionUtils; import fr.xephi.authme.util.ExceptionUtils;
import org.apache.commons.lang.SystemUtils;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -127,7 +126,7 @@ public class AuthMe extends JavaPlugin {
// Check server version // Check server version
if (!isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent") if (!isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")
|| !isClassLoaded("org.bukkit.event.player.PlayerInteractAtEntityEvent")) { || !isClassLoaded("org.bukkit.event.player.PlayerInteractAtEntityEvent")) {
logger.warning("You are running an unsupported server version!" logger.warning("You are running an unsupported server version (" + getServerNameVersionSafe() + "). "
+ "AuthMe requires Spigot 1.8.X or later!"); + "AuthMe requires Spigot 1.8.X or later!");
stopOrUnload(); stopOrUnload();
return; return;
@ -198,11 +197,6 @@ public class AuthMe extends JavaPlugin {
* Initialize the plugin and all the services. * Initialize the plugin and all the services.
*/ */
private void initialize() { private void initialize() {
// Check java version
if (!SystemUtils.isJavaVersionAtLeast(1.8f)) {
throw new IllegalStateException("You need Java 1.8 or above to run this plugin!");
}
// Create plugin folder // Create plugin folder
getDataFolder().mkdir(); getDataFolder().mkdir();
@ -349,4 +343,13 @@ public class AuthMe extends JavaPlugin {
// Handle the command // Handle the command
return commandHandler.processCommand(sender, commandLabel, args); return commandHandler.processCommand(sender, commandLabel, args);
} }
private String getServerNameVersionSafe() {
try {
Server server = getServer();
return server.getName() + " v. " + server.getVersion();
} catch (Throwable ignore) {
return "-";
}
}
} }