|
52 | 52 | import com.comphenix.protocol.utility.ChatExtensions;
|
53 | 53 | import com.comphenix.protocol.utility.EnhancerFactory;
|
54 | 54 | import com.comphenix.protocol.utility.MinecraftVersion;
|
| 55 | +import com.comphenix.protocol.utility.Util; |
55 | 56 | import com.google.common.base.Splitter;
|
56 | 57 | import com.google.common.collect.Iterables;
|
57 | 58 | import com.google.common.collect.Sets;
|
@@ -149,10 +150,16 @@ private enum ProtocolCommand {
|
149 | 150 | @Override
|
150 | 151 | public void onLoad() {
|
151 | 152 | // Logging
|
152 |
| - logger = getLoggerSafely(); |
| 153 | + logger = getLogger(); |
153 | 154 | ProtocolLogger.init(this);
|
154 | 155 |
|
155 |
| - Application.registerPrimaryThread(); |
| 156 | + int java = Util.getJavaVersion(); |
| 157 | + if (java < 8 && !getConfig().getBoolean("ignoreJava", false)) { |
| 158 | + logger.warning("Detected outdated Java version: Java " + java); |
| 159 | + logger.warning("It is recommended that you update to Java 8 as soon as possible."); |
| 160 | + logger.warning("Future versions of ProtocolLib many not support Java " + java + "."); |
| 161 | + logger.warning("Java 8 will allow for much faster reflection performance."); |
| 162 | + } |
156 | 163 |
|
157 | 164 | // Initialize enhancer factory
|
158 | 165 | EnhancerFactory.getInstance().setClassLoader(getClassLoader());
|
@@ -650,26 +657,6 @@ public void onDisable() {
|
650 | 657 | reporter = new BasicErrorReporter();
|
651 | 658 | }
|
652 | 659 |
|
653 |
| - // Get the Bukkit logger first, before we try to create our own |
654 |
| - private Logger getLoggerSafely() { |
655 |
| - Logger log = null; |
656 |
| - |
657 |
| - try { |
658 |
| - log = getLogger(); |
659 |
| - } catch (OutOfMemoryError e) { |
660 |
| - throw e; |
661 |
| - } catch (ThreadDeath e) { |
662 |
| - throw e; |
663 |
| - } catch (Throwable e) { |
664 |
| - // Ignore |
665 |
| - } |
666 |
| - |
667 |
| - // Use the default logger instead |
668 |
| - if (log == null) |
669 |
| - log = Logger.getLogger("Minecraft"); |
670 |
| - return log; |
671 |
| - } |
672 |
| - |
673 | 660 | /**
|
674 | 661 | * Retrieve the metrics instance used to measure users of this library.
|
675 | 662 | * <p>
|
|
0 commit comments