Removed self clan and party check from PartyPledge predicate.

This commit is contained in:
MobiusDevelopment 2019-11-30 19:26:12 +00:00
parent b7459c4825
commit 6b0998c482
15 changed files with 15 additions and 15 deletions

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }

View File

@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty()))) if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
return false; return false;
} }