Improved pledge affect scopes.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java

@@ -50,17 +50,18 @@ public class PartyPledge implements IAffectScopeHandler
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
 			final Party party = player.getParty();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
@@ -68,7 +69,9 @@ public class PartyPledge implements IAffectScopeHandler
 				
 				if (p != player)
 				{
-					if (((p.getClanId() == 0) && (p.getParty() == null)) || ((p.getClanId() != player.getClanId()) && (party != player.getParty())))
+					final Party pParty = p.getParty();
+					final int pClanId = p.getClanId();
+					if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
 					{
 						return false;
 					}

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/Pledge.java

@@ -47,24 +47,29 @@ public class Pledge implements IAffectScopeHandler
 		{
 			final Playable playable = (Playable) target;
 			final PlayerInstance player = playable.getActingPlayer();
+			final int clanId = player.getClanId();
 			
 			// Create the target filter.
 			final AtomicInteger affected = new AtomicInteger(0);
-			final Predicate<Playable> filter = plbl ->
+			final Predicate<Playable> filter = c ->
 			{
 				if ((affectLimit > 0) && (affected.get() >= affectLimit))
 				{
 					return false;
 				}
 				
-				final PlayerInstance p = plbl.getActingPlayer();
+				final PlayerInstance p = c.getActingPlayer();
 				if ((p == null) || p.isDead())
 				{
 					return false;
 				}
-				if ((p != player) && ((p.getClanId() == 0) || (p.getClanId() != player.getClanId())))
+				if (p != player)
 				{
-					return false;
+					final int pClanId = p.getClanId();
+					if ((pClanId == 0) || (pClanId != clanId))
+					{
+						return false;
+					}
 				}
 				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
 				{