Make CompatUtils work properly with no-relocation Paper

2 files changed, 3 insertions, 4 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
index 0c9a7925..cbef7bfd 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
@@ -695,7 +695,6 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
         bossBarHandle = new BossBar_Nothing();
     }
 
-    @SuppressWarnings("deprecation")
     private void setActionBarHandle() {
         try {
             Player.class.getMethod("sendActionBar", String.class);
@@ -738,7 +737,7 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
             return;
         }
 
-        if (CompatUtils.classWithMethodExists("org.bukkit.craftbukkit.{}.inventory.CraftMetaSkull", "setProfile", GameProfile.class)) {
+        if (CompatUtils.classWithMethodExists("{}.inventory.CraftMetaSkull", "setProfile", GameProfile.class)) {
             // Spigot 1.18.1+
             if (CompatUtils.classExists("org.bukkit.profile.PlayerProfile")) {
                 skullGetter = new ModernSkullGetter(this);
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CompatUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CompatUtils.java
index 0541fca7..5967c32c 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CompatUtils.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CompatUtils.java
@@ -5,7 +5,7 @@ import org.bukkit.plugin.Plugin;
 
 public class CompatUtils {
 
-    private static final String version = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
+    private static final String CRAFTBUKKIT_PACKAGE = Bukkit.getServer().getClass().getPackage().getName();
 
     public static boolean classExists(String className) {
         try {
@@ -17,7 +17,7 @@ public class CompatUtils {
     }
 
     public static boolean classWithMethodExists(String className, String methodName, Class<?>... methodParameterTypes) {
-        className = className.replace("{}", version);
+        className = className.replace("{}", CRAFTBUKKIT_PACKAGE);
 
         try {
             Class.forName(className).getDeclaredMethod(methodName, methodParameterTypes);