Fixed PartyPledge affect scope including non clan members.

This commit is contained in:
MobiusDevelopment
2019-06-03 21:29:13 +00:00
parent 3dc1961a66
commit 90329e7fd0
12 changed files with 12 additions and 12 deletions

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }