From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Jan 2022 23:05:41 -0600 Subject: [PATCH] Fix pufferfish issues diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java index ab5fea0b03224bf249352ce340e94704ff713345..3441cdad70da1bd523c5933b1a914688718c2657 100644 --- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java @@ -15,7 +15,7 @@ public class SIMDChecker { @Deprecated public static boolean canEnable(Logger logger) { try { - if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) { + if (SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21) { return false; } else { SIMDDetection.testRun = true; diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java index 88f1ca89fa640a686231b8eec87e70419b2d73ef..d6b91c49a267c89d7df2ddee7ccfe64675d117be 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -47,6 +47,10 @@ public class AnnotationTest { "org/bukkit/plugin/java/PluginClassLoader", // Generic functional interface "org/bukkit/util/Consumer", + // Purpur start + "gg/pufferfish/pufferfish/sentry/SentryContext", + "gg/pufferfish/pufferfish/sentry/SentryContext$State", + // Purpur end // Paper start "io/papermc/paper/util/TransformingRandomAccessList", "io/papermc/paper/util/TransformingRandomAccessList$TransformedListIterator",