Implementation of Pathfind

Pathfinding check has been added. Likely to be the final implementation of the targetting.

Pathfinding is strictly checking for path within 1 block during damage events. If there exists no path between the player and entity, it is assumed the player cannot be attacked.

Created registerCommand() to get rid of the annoying IntelliJ warning wanting me to do Objects.requireNonNull() and no I am totally not angry.

src/main/java/adhdmc/nerffarms/MobDamageListener.java

@@ -1,5 +1,6 @@
 package adhdmc.nerffarms;
 
+import com.destroystokyo.paper.entity.Pathfinder;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
@@ -17,8 +18,8 @@
 import java.util.logging.Logger;
 
 public class MobDamageListener implements Listener {
-    NamespacedKey nerfMob = new NamespacedKey(NerfFarms.plugin, "nerfMob");
-    NamespacedKey environmentalDamage = new NamespacedKey(NerfFarms.plugin, "environmentalDamage");
+    public static final NamespacedKey nerfMob = new NamespacedKey(NerfFarms.plugin, "nerfMob");
+    public static final NamespacedKey environmentalDamage = new NamespacedKey(NerfFarms.plugin, "environmentalDamage");
     byte f = 0;
     byte t = 1;
 
@@ -101,6 +102,13 @@ public void onMobDamage(EntityDamageByEntityEvent damageEvent) {
             mobPDC.set(nerfMob, PersistentDataType.BYTE, t);
             return;
         }
+        if (!hasPathToPlayer((Player) entityDamager, (Mob) damagedEntity)) {
+            if (d) {
+                l.info("Nerfing " + damagedEntity.getName() + " because they never could reach the player.");
+            }
+            mobPDC.set(nerfMob, PersistentDataType.BYTE, t);
+            return;
+        }
         if (ConfigParser.getStandOnBlackList().contains(entityStandingOn)) {
             if (d) {
                 l.info("Nerfing " + damagedEntity.getName() + " since they are standing on " + entityStandingOn);
@@ -116,7 +124,17 @@ public void onMobDamage(EntityDamageByEntityEvent damageEvent) {
         }
     }
 
-    private void addPDCDamage(PersistentDataContainer mobPDC, double damage) {
+    private boolean hasPathToPlayer(Player p, Mob m) {
+        Location playerLoc = p.getLocation();
+        Pathfinder.PathResult entityPath = m.getPathfinder().findPath(p);
+        if (entityPath == null) { return false; }
+        Location finalLoc = entityPath.getFinalPoint();
+        if (finalLoc == null) { return false; }
+        // TODO: Make configurable distance.
+        return playerLoc.distance(finalLoc) < 1;
+    }
+
+    private static void addPDCDamage(PersistentDataContainer mobPDC, double damage) {
         double damageTotal = mobPDC.getOrDefault(environmentalDamage, PersistentDataType.DOUBLE, 0.0);
         damageTotal += damage;
         mobPDC.set(environmentalDamage, PersistentDataType.DOUBLE, damageTotal);

src/main/java/adhdmc/nerffarms/NerfFarms.java

@@ -2,6 +2,9 @@
 
 import adhdmc.nerffarms.Commands.CommandHandler;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -22,7 +25,13 @@ public void onEnable() {
         this.saveDefaultConfig();
         this.getServer().getPluginManager().registerEvents(new MobDeathListener(), this);
         this.getServer().getPluginManager().registerEvents(new MobDamageListener(), this);
-        this.getCommand("nerffarms").setExecutor(new CommandHandler());
+        registerCommand(this.getCommand("nerffarms"), new CommandHandler());
+    }
+
+    private static void registerCommand(PluginCommand command, CommandExecutor executor) {
+        if (command != null) {
+            command.setExecutor(executor);
+        }
     }
 
     private void configDefaults() {