diff options
Diffstat (limited to 'patches/server/0982-Adopt-MaterialRerouting.patch')
| -rw-r--r-- | patches/server/0982-Adopt-MaterialRerouting.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/server/0982-Adopt-MaterialRerouting.patch b/patches/server/0982-Adopt-MaterialRerouting.patch index c1057b6bc1..acdc787b2c 100644 --- a/patches/server/0982-Adopt-MaterialRerouting.patch +++ b/patches/server/0982-Adopt-MaterialRerouting.patch @@ -94,10 +94,10 @@ index 3ff0f0e34356cee4c510fdd60af723b1c5df156a..9c004e7cb46841d874ab997bf2e3b63a + // Paper end - register paper API specific material consumers in rerouting } diff --git a/src/test/java/org/bukkit/craftbukkit/legacy/MaterialReroutingTest.java b/src/test/java/org/bukkit/craftbukkit/legacy/MaterialReroutingTest.java -index 26208ca74688be062584824de5d074321b33f1b1..946cd46f3389a4d4ceda86e0115c59c5725a8a0a 100644 +index a5f3d562afec242912589bfc053ff91ede77347e..0fac826b9367a821c6801190997592219cb47f73 100644 --- a/src/test/java/org/bukkit/craftbukkit/legacy/MaterialReroutingTest.java +++ b/src/test/java/org/bukkit/craftbukkit/legacy/MaterialReroutingTest.java -@@ -55,6 +55,9 @@ public class MaterialReroutingTest extends AbstractTestingBase { +@@ -56,6 +56,9 @@ public class MaterialReroutingTest extends AbstractTestingBase { .filter(entry -> !entry.getName().endsWith("ItemType.class")) .filter(entry -> !entry.getName().endsWith("Registry.class")) .filter(entry -> !entry.getName().startsWith("org/bukkit/material")) @@ -107,7 +107,7 @@ index 26208ca74688be062584824de5d074321b33f1b1..946cd46f3389a4d4ceda86e0115c59c5 .map(entry -> { try { return MaterialReroutingTest.jarFile.getInputStream(entry); -@@ -92,6 +95,10 @@ public class MaterialReroutingTest extends AbstractTestingBase { +@@ -93,6 +96,10 @@ public class MaterialReroutingTest extends AbstractTestingBase { continue; } } @@ -116,9 +116,9 @@ index 26208ca74688be062584824de5d074321b33f1b1..946cd46f3389a4d4ceda86e0115c59c5 + if (isInternal(methodNode.invisibleAnnotations)) continue; + // Paper end - filter out more methods from rerouting test - if (!Commodore.rerouteMethods(Collections.emptySet(), MaterialReroutingTest.MATERIAL_METHOD_REROUTE, (methodNode.access & Opcodes.ACC_STATIC) != 0, classNode.name, methodNode.name, methodNode.desc, a -> { })) { + if (!Commodore.rerouteMethods(Collections.emptySet(), ApiVersion.CURRENT, MaterialReroutingTest.MATERIAL_METHOD_REROUTE, (methodNode.access & Opcodes.ACC_STATIC) != 0, classNode.name, methodNode.name, methodNode.desc, a -> { })) { missingReroute.add(methodNode.name + " " + methodNode.desc + " " + methodNode.signature); -@@ -108,6 +115,13 @@ public class MaterialReroutingTest extends AbstractTestingBase { +@@ -109,6 +116,13 @@ public class MaterialReroutingTest extends AbstractTestingBase { } } |