diff options
| author | Shane Freeder <[email protected]> | 2021-04-12 05:16:16 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2021-04-12 05:16:20 +0100 |
| commit | 4492bc4cc18d29471ae6ab58dc20c8212cf6e5b8 (patch) | |
| tree | fd3c38d34b429bda0e62042fc5d176cd152d2ba0 | |
| parent | be13705177a54381d9101195e030196e2c940574 (diff) | |
| download | Paper-4492bc4cc18d29471ae6ab58dc20c8212cf6e5b8.tar.gz Paper-4492bc4cc18d29471ae6ab58dc20c8212cf6e5b8.zip | |
remove l4j class no longer in existence from preload list
| -rw-r--r-- | Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch index e40446df85..e7b5bbb669 100644 --- a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch +++ b/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch @@ -287,7 +287,7 @@ index 8050be2ed04fb0b8141f92595680407bba65dad5..bb9c6e9aeb1f30af01338476ba1dd618 list.stream().map((playerchunk) -> { CompletableFuture completablefuture; diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index c69eef0d523fc75dce2c2606f3e447591c7cf6dc..da3614a4a59884e7cbc8758cfdad9698eb15424f 100644 +index ae99f3fb3a4b37c737fb276590004b2e10beab5a..06fa9b91cc103a5d5f39ab8fcfb5ccad4cf0e5de 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -177,7 +177,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -358,7 +358,7 @@ index 4828d356ca01cba5964c6397584d56643dbc0dae..55890ff463eb122934e8ba1fc550cf0c // Paper start diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..c0c08a9a4c6b44f3c1f79c8e4635472ef9c7dc99 100644 +index 100772ba60cb7e717c5e626a4d7b44c15375b0e5..f9a1f1a83be91e302e9a2d29fefc5b21d9f0e590 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -12,6 +12,8 @@ import java.util.logging.Level; @@ -370,7 +370,7 @@ index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..c0c08a9a4c6b44f3c1f79c8e4635472e import net.minecrell.terminalconsole.TerminalConsoleAppender; // Paper public class Main { -@@ -150,6 +152,37 @@ public class Main { +@@ -150,6 +152,36 @@ public class Main { OptionSet options = null; @@ -401,14 +401,13 @@ index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..c0c08a9a4c6b44f3c1f79c8e4635472e + tryPreloadClass("org.apache.logging.log4j.core.async.DisruptorUtil"); + tryPreloadClass("org.apache.logging.log4j.core.async.RingBufferLogEventHandler"); + tryPreloadClass("org.apache.logging.log4j.core.impl.ThrowableProxy"); -+ tryPreloadClass("org.apache.logging.log4j.core.impl.ThrowableProxy$CacheEntry"); + tryPreloadClass("org.apache.logging.log4j.core.impl.ExtendedClassInfo"); + tryPreloadClass("org.apache.logging.log4j.core.impl.ExtendedStackTraceElement"); + // Paper end try { options = parser.parse(args); } catch (joptsimple.OptionException ex) { -@@ -245,8 +278,64 @@ public class Main { +@@ -245,8 +277,64 @@ public class Main { } catch (Throwable t) { t.printStackTrace(); } |