From d03f9429647583a1661446e4a59e755ad60e0000 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Tue, 12 Oct 2021 10:53:08 +0200 Subject: [PATCH] Java 16 compatibility patch --- .../Java_16+_compatibility.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Spigot/SteamWar-Patches/Java_16+_compatibility.patch diff --git a/Spigot/SteamWar-Patches/Java_16+_compatibility.patch b/Spigot/SteamWar-Patches/Java_16+_compatibility.patch new file mode 100644 index 0000000..33032e7 --- /dev/null +++ b/Spigot/SteamWar-Patches/Java_16+_compatibility.patch @@ -0,0 +1,42 @@ +Index: src/main/java/org/bukkit/craftbukkit/Main.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +--- a/src/main/java/org/bukkit/craftbukkit/Main.java (revision d76473b20f3293a484a068a0ff75a639ec2d643f) ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java (date 1632915948024) +@@ -156,12 +156,6 @@ + return; + } + +- float javaVersion = Float.parseFloat(System.getProperty("java.class.version")); +- if (javaVersion > 58.0) { +- System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 14 is supported."); +- return; +- } +- + try { + // This trick bypasses Maven Shade's clever rewriting of our getProperty call when using String literals + String jline_UnsupportedTerminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 'l'}); +Index: src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java (revision d76473b20f3293a484a068a0ff75a639ec2d643f) ++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java (date 1634028680235) +@@ -289,12 +289,6 @@ + + @Override + public byte[] processClass(PluginDescriptionFile pdf, String path, byte[] clazz) { +- try { +- clazz = Commodore.convert(clazz, !isLegacy(pdf)); +- } catch (Exception ex) { +- Bukkit.getLogger().log(Level.SEVERE, "Fatal error trying to convert " + pdf.getFullName() + ":" + path, ex); +- } +- + return clazz; + } +