From c8d844ab7117c24ee6108bf0599ca550785d674f Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Tue, 16 Mar 2021 17:51:13 +0100 Subject: [PATCH] Actually fix preloading this time --- .../0369-Asynchronous-chunk-IO-and-loading.patch | 4 ++-- .../0438-Improved-Watchdog-Support.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch index def8d896ee..0d6510a975 100644 --- a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch @@ -2328,7 +2328,7 @@ index fbd33aef21b4539d249c367609a36491530fb7ca..5a410550cfb48505c9de9979465ed152 + } } diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 191a74bd9b894f9d64d0a55747cb17e07ceef597..c0f5fdb832115c5a86005e4c3242d9fd7e52f82c 100644 +index 191a74bd9b894f9d64d0a55747cb17e07ceef597..1732fc552c290d294b68d6f92f2a58d985fbef21 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -42,6 +42,7 @@ import net.minecraft.server.players.UserCache; @@ -2343,7 +2343,7 @@ index 191a74bd9b894f9d64d0a55747cb17e07ceef597..c0f5fdb832115c5a86005e4c3242d9fd convertable_conversionsession.a((IRegistryCustom) iregistrycustom_dimension, (SaveData) object); */ -+ Class.forName(VillagerTrades.class.getSimpleName());// Paper - load this sync so it won't fail later async ++ Class.forName(VillagerTrades.class.getName());// Paper - load this sync so it won't fail later async final DedicatedServer dedicatedserver = (DedicatedServer) MinecraftServer.a((thread) -> { DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, datapackconfiguration1, thread, iregistrycustom_dimension, convertable_conversionsession, resourcepackrepository, datapackresources, null, dedicatedserversettings, DataConverterRegistry.a(), minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new); diff --git a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch index f71293d47c..e40446df85 100644 --- a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch +++ b/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch @@ -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..2a36de929e6d433b0f67f0a901c03c624cd41e17 100644 +index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..c0c08a9a4c6b44f3c1f79c8e4635472ef9c7dc99 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; @@ -451,9 +451,9 @@ index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..2a36de929e6d433b0f67f0a901c03c62 + tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent"); + tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent"); + // Minecraft, seen during saving -+ tryPreloadClass(LightEngineLayerEventListener.Void.class.getSimpleName()); -+ tryPreloadClass(LightEngineLayerEventListener.class.getSimpleName()); -+ tryPreloadClass(ExceptionSuppressor.class.getSimpleName()); ++ tryPreloadClass(LightEngineLayerEventListener.Void.class.getName()); ++ tryPreloadClass(LightEngineLayerEventListener.class.getName()); ++ tryPreloadClass(ExceptionSuppressor.class.getName()); + // Paper end + } + }