From 9d21a882182a2b9c673150a2a2c2c2d0dd4b3b8b Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 4 Oct 2023 07:58:30 +1000 Subject: Fix tests --- patches/server/0002-Remap-fixes.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch index 34dc7ba44e..98f79e8f75 100644 --- a/patches/server/0002-Remap-fixes.patch +++ b/patches/server/0002-Remap-fixes.patch @@ -143,6 +143,19 @@ index 6be404dafe1f0ae5ab39a0782e4c3ca7c0923752..545a329a52be0dc1f3cf8ca1315152d8 List excessKeys = new ArrayList<>(); for (Field field : clazz.getFields()) { +diff --git a/src/test/java/org/bukkit/RegistryLoadOrderTest.java b/src/test/java/org/bukkit/RegistryLoadOrderTest.java +index e4298c14eb793743081cb0088427bb5a50d74b46..194ff80040eec0427acfef644cd85666370902fa 100644 +--- a/src/test/java/org/bukkit/RegistryLoadOrderTest.java ++++ b/src/test/java/org/bukkit/RegistryLoadOrderTest.java +@@ -20,7 +20,7 @@ public class RegistryLoadOrderTest extends AbstractTestingBase { + + private static boolean initInterface = false; + private static boolean initAbstract = false; +- private static Registry registry; ++ private static org.bukkit.Registry registry; // Paper - remap fix + + public static Stream data() { + return Stream.of( diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java index 32df0090aab65b551b524603cce0b96e461cc358..952924abae79cc504342bbdb6f6953ab8a6cc295 100644 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java -- cgit v1.2.3