From 90329e7fd01e4a15c852158632b8bbf88d06a798 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 3 Jun 2019 21:29:13 +0000 Subject: [PATCH] Fixed PartyPledge affect scope including non clan members. --- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index ba8193a852..42af3cfba7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler { final Party pParty = p.getParty(); final int pClanId = p.getClanId(); - if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty))) + if ((pParty == null) || ((clanId != pClanId) && (party != pParty))) { return false; }