Merge pull request #810

Lands

expansion/compatibility/Lands/build.gradle.kts

@@ -4,5 +4,5 @@ repositories {
 
 dependencies {
     compileOnly(project(":expansion:newbie-helper"))
-    compileOnly("com.github.Angeschossen:LandsAPI:6.42.0")
+    compileOnly("com.github.Angeschossen:LandsAPI:6.44.13")
 }

expansion/compatibility/Lands/src/main/java/combatlogx/expansion/compatibility/region/lands/RegionHandlerLands.java

@@ -2,6 +2,7 @@
 
 import java.util.UUID;
 
+import me.angeschossen.lands.api.player.LandPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -48,6 +49,12 @@ public boolean isSafeZone(@NotNull Player player, @NotNull Location location, @N
         }
 
         Entity enemy = tag.getCurrentEnemy();
+        if (enemy instanceof Player) { // if target is player, check for attack flag and wars. this makes sure that BOTH players are allowed to fight, not just the attacker, since attackers can only attack players that are allowed to fight back
+            LandPlayer attacker = landsIntegration.getLandPlayer(player.getUniqueId()), target = landsIntegration.getLandPlayer(enemy.getUniqueId());
+            return !area.canPvP(attacker, target, false) // if one of them can't fight, consider as safe zone, since it results in both of them not being able to fight in area
+                    || area.canEnter(attacker, false) != area.canEnter(target, false); // if both of them can't enter: ignore, their entry will be denied by Lands anyway. Otherwise, make sure both of them can enter
+        }
+
         TagType tagType = tag.getCurrentTagType();
         RoleFlag roleFlag = getRoleFlag(tagType, enemy);
         if (roleFlag == null) {