From 6b0998c482195b0d903cdd9a1824aace834b2632 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 30 Nov 2019 19:26:12 +0000 Subject: [PATCH] Removed self clan and party check from PartyPledge predicate. --- .../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 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- .../handlers/targethandlers/affectscope/PartyPledge.java | 2 +- 15 files changed, 15 insertions(+), 15 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { return false; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index 3653221330..b7d2e2db7c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { 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 3653221330..b7d2e2db7c 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 @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index 3653221330..b7d2e2db7c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { return false; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java index 3653221330..b7d2e2db7c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java @@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler return false; } - if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) + if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) { return false; }