Also include CraftServer and CraftOfflinePlayer

Author: Novampr

core/src/main/java/org/geysermc/floodgate/util/ReflectionUtils.java

@@ -162,6 +162,12 @@ public static Class<?> getClassOrFallback(String className, String fallbackClass
         return clazz;
     }
 
+    @Nullable
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> getCastedClassOrFallback(String className, String fallbackClassName) {
+        return (Class<T>) getClassOrFallback(className, fallbackClassName);
+    }
+
     @Nullable
     public static <T> Constructor<T> getConstructor(Class<T> clazz, boolean declared, Class<?>... parameters) {
         try {

spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java

@@ -143,10 +143,14 @@ public class ClassNames {
         );
 
         // WhitelistUtils
-        Class<?> craftServerClass = ReflectionUtils.getClass(
-                "org.bukkit.craftbukkit.CraftServer");
-        Class<OfflinePlayer> craftOfflinePlayerClass = ReflectionUtils.getCastedClass(
-                "org.bukkit.craftbukkit.CraftOfflinePlayer");
+        Class<?> craftServerClass = getClassOrFallback(
+                "org.bukkit.craftbukkit.CraftServer",
+                "org.bukkit.craftbukkit." + version + "CraftServer"
+        );
+        Class<OfflinePlayer> craftOfflinePlayerClass = ReflectionUtils.getCastedClassOrFallback(
+                "org.bukkit.craftbukkit.CraftOfflinePlayer",
+                "org.bukkit.craftbukkit." + version + "CraftOfflinePlayer"
+        );
 
         CRAFT_OFFLINE_PLAYER_CONSTRUCTOR = ReflectionUtils.getConstructor(
                 craftOfflinePlayerClass, true, craftServerClass, GameProfile.class);