From c9ba11e0fc705fb46efdff0a741a8eb0befcca00 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Tue, 16 Mar 2021 17:00:33 +0100 Subject: [PATCH] more work --- .../Implement-Mob-Goal-API.patch | 4 ++-- .../fixup-Improved-Watchdog-Support.patch | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Spigot-Server-Patches/fixup-Improved-Watchdog-Support.patch diff --git a/Spigot-Server-Patches/Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/Implement-Mob-Goal-API.patch index b0df718fbf..e00f77dc31 100644 --- a/Spigot-Server-Patches/Implement-Mob-Goal-API.patch +++ b/Spigot-Server-Patches/Implement-Mob-Goal-API.patch @@ -1104,8 +1104,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + + List> classes; -+ try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages("net.minecraft.server").scan()) { -+ classes = scanResult.getSubclasses("net.minecraft.server.PathfinderGoal").loadClasses(); ++ try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages("net.minecraft").scan()) { ++ classes = scanResult.getSubclasses(PathfinderGoal.class.getName()).loadClasses(); + } + + List> vanillaNames = classes.stream() diff --git a/Spigot-Server-Patches/fixup-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/fixup-Improved-Watchdog-Support.patch new file mode 100644 index 0000000000..3b6f893812 --- /dev/null +++ b/Spigot-Server-Patches/fixup-Improved-Watchdog-Support.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mariell Hoversholm +Date: Tue, 16 Mar 2021 16:56:35 +0100 +Subject: [PATCH] fixup! Improved Watchdog Support + + +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -0,0 +0,0 @@ public class Main { + tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent"); + tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent"); + // Minecraft, seen during saving +- tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener$Void"); +- tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener"); +- tryPreloadClass("net.minecraft.server.ExceptionSuppressor"); ++ tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener$Void"); ++ tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener"); ++ tryPreloadClass("net.minecraft.util.ExceptionSuppressor"); + // Paper end + } + }