Bladeren bron

Changes not applied from last commit.

HorridoJoho 3 jaren geleden
bovenliggende
commit
4981c2d543
1 gewijzigde bestanden met toevoegingen van 6 en 9 verwijderingen
  1. 6 9
      src/main/java/com/l2jserver/gameserver/model/actor/L2Playable.java

+ 6 - 9
src/main/java/com/l2jserver/gameserver/model/actor/L2Playable.java

@@ -205,10 +205,6 @@ public abstract class L2Playable extends L2Character {
 			return false; // Active player is null
 		}
 		
-		if (player.getKarma() != 0) {
-			return false; // Active player has karma
-		}
-		
 		final L2PcInstance targetPlayer = target.getActingPlayer();
 		if (targetPlayer == null) {
 			return false; // Target player is null
@@ -217,20 +213,21 @@ public abstract class L2Playable extends L2Character {
 		if (targetPlayer == this) {
 			return false; // Target player is self
 		}
-
+		
+		// pvp zone is always pvp 
 		if (player.isInsideZone(ZoneId.PVP) && player.isInsideZone(ZoneId.PVP)) {
 			return true;
 		}
+
+		if (player.getKarma() != 0 || targetPlayer.getKarma() != 0) {
+			return false; // Active player or target player has karma
+		}
 		
 		if ((player.getClan() != null) && (targetPlayer.getClan() != null) && targetPlayer.getClan().isAtWarWith(player.getClanId()) && player.getClan().isAtWarWith(targetPlayer.getClanId()) && (player.getWantsPeace() == 0) && (targetPlayer.getWantsPeace() == 0) && !player.isAcademyMember()
 			&& !targetPlayer.isAcademyMember()) {
 			return true; // Target player and player has war
 		}
 
-		if (targetPlayer.getKarma() != 0) {
-			return false; // Target player has karma
-		}
-		
 		return targetPlayer.getPvpFlag() != 0;
 	}