diff --git a/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java b/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java index 2038d496d5bb1abd53c33e7ab36d4a6315bbb486..c6f03a4a51b3e131f1382a812a6f48853d96761e 100644 --- a/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java +++ b/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java @@ -50,11 +50,11 @@ public class EnemyOnly implements ITargetTypeHandler final L2PcInstance player = activeChar.getActingPlayer(); if (target.isDead() || (!target.isAttackable() && // (player != null) && // - !player.isInPartyWith(target) && // - !player.isInClanWith(target) && // - !player.isInAllyWith(target) && // TODO(Zoey76): Confirm. - !player.isInCommandChannelWith(target) && // TODO(Zoey76): Confirm. - !player.checkIfPvP(target))) + (player.isInPartyWith(target) || // + player.isInClanWith(target) || // + player.isInAllyWith(target) || // TODO(Zoey76): Confirm. + player.isInCommandChannelWith(target)) // TODO(Zoey76): Confirm. + && !player.checkIfPvP(target))) { activeChar.sendPacket(INCORRECT_TARGET); return EMPTY_TARGET_LIST;