aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2023-10-04 07:58:30 +1000
committerNassim Jahnke <[email protected]>2023-10-04 07:58:30 +1000
commit9d21a882182a2b9c673150a2a2c2c2d0dd4b3b8b (patch)
tree815698edd58adaabe80e153f662f8e2fe976902e
parentbb1c0dd6fabc62d142309bdff1ce72ec112975dd (diff)
downloadPaper-9d21a882182a2b9c673150a2a2c2c2d0dd4b3b8b.tar.gz
Paper-9d21a882182a2b9c673150a2a2c2c2d0dd4b3b8b.zip
Fix tests
-rw-r--r--patches/server/0002-Remap-fixes.patch13
1 files changed, 13 insertions, 0 deletions
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<NamespacedKey> 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<Keyed> registry;
++ private static org.bukkit.Registry<Keyed> registry; // Paper - remap fix
+
+ public static Stream<Arguments> 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