From 0d217001c4cbd21bedc0a2fad2bb7a81495c0bc6 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Tue, 16 Mar 2021 17:00:33 +0100
Subject: [PATCH] more work

---
 .../0466-Implement-Mob-Goal-API.patch         |  6 ++---
 ...0696-fixup-Improved-Watchdog-Support.patch | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 Spigot-Server-Patches/0696-fixup-Improved-Watchdog-Support.patch

diff --git a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
index dd71899d3..78f694df3 100644
--- a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
@@ -1060,7 +1060,7 @@ index 96652862531301c08aefa0baa79b1258b5b307ec..3014a5d71de98009bdc121ba690c3653
  }
 diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a75276b93f3f84672224b5c314a60aad8baf0cac
+index 0000000000000000000000000000000000000000..abc99e48f7d55e8faf1f317083146c76619e5f96
 --- /dev/null
 +++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
 @@ -0,0 +1,102 @@
@@ -1104,8 +1104,8 @@ index 0000000000000000000000000000000000000000..a75276b93f3f84672224b5c314a60aad
 +        }
 +
 +        List<Class<?>> 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<GoalKey<?>> vanillaNames = classes.stream()
diff --git a/Spigot-Server-Patches/0696-fixup-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0696-fixup-Improved-Watchdog-Support.patch
new file mode 100644
index 000000000..627cef710
--- /dev/null
+++ b/Spigot-Server-Patches/0696-fixup-Improved-Watchdog-Support.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mariell Hoversholm <proximyst@proximyst.com>
+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 22bde395939f97086e411cef190bb2b1e7ede79a..8a1ff1000f82a590b293e8892a34484df068093c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -316,9 +316,9 @@ 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
+         }
+     }