GH-334 Folia pearl fix

eternalcombat-plugin/build.gradle.kts

@@ -168,6 +168,12 @@ tasks {
         downloadPlugins.modrinth("WorldGuard", Versions.WORLDGUARD)
         downloadPlugins.modrinth("LuckPerms", "v${Versions.LUCKPERMS}-bukkit")
     }
+
+    runPaper.folia.registerTask {
+        minecraftVersion("1.21.11")
+
+        downloadPlugins.modrinth("PacketEvents", "${Versions.PACKETEVENTS}+spigot")
+    }
 }
 
 tasks.shadowJar {

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

@@ -214,6 +214,7 @@ public void onEnable() {
     @Override
     public void onDisable() {
         EternalCombatProvider.deinitialize();
+        FoliaChecker.clearCache();
 
         if (this.liteCommands != null) {
             this.liteCommands.unregister();

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatSchedulerAdapter.java

@@ -8,23 +8,19 @@
 
 public final class CombatSchedulerAdapter {
 
-    private static final String FOLIA_CLASS = "io.papermc.paper.threadedregions.RegionizedServer";
-
     private CombatSchedulerAdapter() {
         throw new UnsupportedOperationException("This is an utility class and cannot be instantiated");
     }
 
     public static MinecraftScheduler getAdaptiveScheduler(Plugin plugin) {
         Logger logger = plugin.getLogger();
 
-        try {
-            Class.forName(FOLIA_CLASS);
+        if (FoliaChecker.isFolia()) {
             logger.info("» Detected Folia environment. Using FoliaScheduler.");
             return new FoliaSchedulerImpl(plugin);
         }
-        catch (ClassNotFoundException exception) {
-            logger.info("» Detected Bukkit/Paper environment. Using BukkitScheduler.");
-            return new BukkitSchedulerImpl(plugin);
-        }
+
+        logger.info("» Detected Bukkit/Paper environment. Using BukkitScheduler.");
+        return new BukkitSchedulerImpl(plugin);
     }
 }

eternalcombat-plugin/src/main/java/com/eternalcode/combat/FoliaChecker.java

@@ -0,0 +1,36 @@
+package com.eternalcode.combat;
+
+public final class FoliaChecker {
+
+    private static final String FOLIA_CLASS = "io.papermc.paper.threadedregions.RegionizedServer";
+    private static Boolean isFoliaPresent = null;
+
+    private FoliaChecker() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+
+    public static boolean isFolia() {
+        return detectFoliaEnvironment();
+    }
+
+    private static synchronized boolean detectFoliaEnvironment() {
+        if (isFoliaPresent != null) {
+            return isFoliaPresent;
+        }
+
+        try {
+            Class.forName(FOLIA_CLASS);
+            isFoliaPresent = true;
+        }
+        catch (ClassNotFoundException exception) {
+            isFoliaPresent = false;
+        }
+
+        return isFoliaPresent;
+    }
+
+    public static void clearCache() {
+        isFoliaPresent = null;
+    }
+
+}

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightTagController.java

@@ -1,5 +1,6 @@
 package com.eternalcode.combat.fight.controller;
 
+import com.eternalcode.combat.FoliaChecker;
 import com.eternalcode.combat.WhitelistBlacklistMode;
 import com.eternalcode.combat.config.implementation.PluginConfig;
 import com.eternalcode.combat.fight.FightManager;
@@ -55,6 +56,16 @@ void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
             return;
         }
 
+        UUID targetId = attackedPlayerByPerson.getUniqueId();
+        UUID attackerId = attacker.getUniqueId();
+
+        if (
+            targetId.equals(attackerId)
+            && FoliaChecker.isFolia()
+        ) {
+            return;
+        }
+
         if (this.config.combat.disableFlying) {
             if (attackedPlayerByPerson.isFlying()) {
                 attackedPlayerByPerson.setFlying(false);
@@ -68,11 +79,9 @@ void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
         }
 
         Duration combatTime = this.config.settings.combatTimerDuration;
-        UUID attackedUniqueId = attackedPlayerByPerson.getUniqueId();
-        UUID attackerUniqueId = attacker.getUniqueId();
 
-        this.fightManager.tag(attackedUniqueId, combatTime, CauseOfTag.PLAYER, attackerUniqueId);
-        this.fightManager.tag(attackerUniqueId, combatTime, CauseOfTag.PLAYER, attackedUniqueId);
+        this.fightManager.tag(targetId, combatTime, CauseOfTag.PLAYER, attackerId);
+        this.fightManager.tag(attackerId, combatTime, CauseOfTag.PLAYER, targetId);
     }