Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 15:04:06 +01:00
Code Issues Projects Releases Wiki Activity

Actually fix preloading this time

Browse Source
This commit is contained in:
Mariell Hoversholm 2021-03-16 17:51:13 +01:00
parent e62aa5e3e4
commit c8d844ab71
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
View File

@ -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 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 --- a/src/main/java/net/minecraft/server/Main.java
+++ b/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; @@ -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); 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) -> { 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); DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, datapackconfiguration1, thread, iregistrycustom_dimension, convertable_conversionsession, resourcepackrepository, datapackresources, null, dedicatedserversettings, DataConverterRegistry.a(), minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new);

8
Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch
View File

@ -358,7 +358,7 @@ index 4828d356ca01cba5964c6397584d56643dbc0dae..55890ff463eb122934e8ba1fc550cf0c
// Paper start // Paper start
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java 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 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/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; @@ -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.player.PlayerConnectionCloseEvent");
+ tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent"); + tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent");
+ // Minecraft, seen during saving + // Minecraft, seen during saving
+ tryPreloadClass(LightEngineLayerEventListener.Void.class.getSimpleName()); + tryPreloadClass(LightEngineLayerEventListener.Void.class.getName());
+ tryPreloadClass(LightEngineLayerEventListener.class.getSimpleName()); + tryPreloadClass(LightEngineLayerEventListener.class.getName());
+ tryPreloadClass(ExceptionSuppressor.class.getSimpleName()); + tryPreloadClass(ExceptionSuppressor.class.getName());
+ // Paper end + // Paper end
+ } + }
+ } + }