From cf1a0c1bef9be8f7714956565735c88907527178 Mon Sep 17 00:00:00 2001 From: games647 Date: Sun, 14 May 2017 17:11:10 +0200 Subject: [PATCH] Remove ebean util usage to make it compatible with 1.12 --- bukkit/pom.xml | 2 +- .../games647/fastlogin/bukkit/FastLoginBukkit.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index e2e4d4f8..7e40b57e 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -71,7 +71,7 @@ org.spigotmc spigot-api - 1.11-R0.1-SNAPSHOT + 1.12-pre2-SNAPSHOT provided diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java index 3ab95ad5..6686f91b 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java @@ -1,6 +1,5 @@ package com.github.games647.fastlogin.bukkit; -import com.avaje.ebeaninternal.api.ClassUtil; import com.github.games647.fastlogin.bukkit.commands.CrackedCommand; import com.github.games647.fastlogin.bukkit.commands.ImportCommand; import com.github.games647.fastlogin.bukkit.commands.PremiumCommand; @@ -17,7 +16,6 @@ import com.github.games647.fastlogin.core.shared.PlatformPlugin; import com.google.common.collect.Iterables; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; - import java.io.Reader; import java.security.KeyPair; import java.util.List; @@ -26,9 +24,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ThreadFactory; import java.util.logging.Level; import java.util.logging.Logger; - import net.md_5.bungee.api.ChatColor; - import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; @@ -56,9 +52,9 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin(this); core.load(); try { - if (ClassUtil.isPresent("org.spigotmc.SpigotConfig")) { - bungeeCord = Class.forName("org.spigotmc.SpigotConfig").getDeclaredField("bungee").getBoolean(null); - } + bungeeCord = Class.forName("org.spigotmc.SpigotConfig").getDeclaredField("bungee").getBoolean(null); + } catch (ClassNotFoundException notFoundEx) { + //ignore server has no bungee support } catch (Exception ex) { getLogger().log(Level.WARNING, "Cannot check bungeecord support. You use a non-spigot build", ex); }