Fixed PartyPledge affect scope including non clan members.
This commit is contained in:
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -71,7 +71,7 @@ public class PartyPledge implements IAffectScopeHandler
|
|||||||
{
|
{
|
||||||
final Party pParty = p.getParty();
|
final Party pParty = p.getParty();
|
||||||
final int pClanId = p.getClanId();
|
final int pClanId = p.getClanId();
|
||||||
if (((pClanId == 0) && (pParty == null)) || ((clanId != pClanId) && (party != pParty)))
|
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user