'enhance los traces' config option

mcmonkeyprojects · Jan 24, 2023 · 8bfea3f · 8bfea3f
1 parent 3e09e52
commit 8bfea3f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelPlugin.java b/src/main/java/org/mcmonkey/sentinel/SentinelPlugin.java
@@ -206,6 +206,11 @@ public ArrayList<SentinelTrait> cleanCurrentList() {
      */
     public boolean hasWorldGuard;
 
+    /**
+     * Whether to use smarter LOS tracing.
+     */
+    public boolean enhanceLosTraces;
+
     /**
      * Fills the {@code vaultPerms} object if possible.
      */
@@ -273,6 +278,7 @@ public void loadConfigSettings() {
         minShootSpeed = getConfig().getDouble("random.shoot speed minimum", 20);
         workaroundDrops = getConfig().getBoolean("random.workaround drops", false) || blockEvents;
         deathMessages = getConfig().getBoolean("random.death messages", true);
+        enhanceLosTraces = getConfig().getBoolean("random.enhance los traces", true);
         try {
             spectralSound = Sound.valueOf(getConfig().getString("random.spectral sound", "ENTITY_VILLAGER_YES"));
         }

diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelUtilities.java b/src/main/java/org/mcmonkey/sentinel/SentinelUtilities.java
@@ -532,7 +532,14 @@ public static boolean checkLineOfSightWithTransparency(LivingEntity start, Livin
         if (!SentinelVersionCompat.v1_13) {
             return start.hasLineOfSight(end);
         }
-        return checkLineOfSightWithTransparency(start.getEyeLocation(), end.getEyeLocation());
+        if (checkLineOfSightWithTransparency(start.getEyeLocation(), end.getEyeLocation())) {
+            return true;
+        }
+        if (!SentinelPlugin.instance.enhanceLosTraces) {
+            return false;
+        }
+        return checkLineOfSightWithTransparency(start.getEyeLocation(), end.getLocation())
+                || checkLineOfSightWithTransparency(start.getEyeLocation(), end.getLocation().add(0, 1.05, 0));
     }
 
     /**

diff --git a/src/main/java/org/mcmonkey/sentinel/targeting/SentinelTargetingHelper.java b/src/main/java/org/mcmonkey/sentinel/targeting/SentinelTargetingHelper.java
@@ -32,10 +32,10 @@ public boolean canSee(LivingEntity entity) {
         if (getLivingEntity().getEyeLocation().distanceSquared(entity.getEyeLocation()) > sentinel.range * sentinel.range) {
             return false;
         }
-        if (!sentinel.ignoreLOS && !SentinelUtilities.checkLineOfSightWithTransparency(getLivingEntity(), entity)) {
+        if (sentinel.realistic && !SentinelUtilities.isLookingTowards(getLivingEntity().getEyeLocation(), entity.getLocation(), 90, 110)) {
             return false;
         }
-        if (sentinel.realistic && !SentinelUtilities.isLookingTowards(getLivingEntity().getEyeLocation(), entity.getLocation(), 90, 110)) {
+        if (!sentinel.ignoreLOS && !SentinelUtilities.checkLineOfSightWithTransparency(getLivingEntity(), entity)) {
             return false;
         }
         return true;

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -95,6 +95,9 @@ random:
     ignore invisible targets: true
     # Whether to prevent players from damaging NPCs that are guarding them.
     no guard damage: true
+    # If false: checks from NPC eye to target eye. If true: checks from NPC eye to multiple points on target body.
+    # 'true' is smarter at checking, at the cost of performance.
+    enhance los traces: true
     # Distances used for NPCs following their guarded player
     guard follow distance:
         # Maximum possible distance of point to choose (relative to the guarded player)