Simplified PartyPledge affect scope logic.

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

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))

View File

@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false;
}
if (p != player)
if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{
final Party pParty = p.getParty();
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
return false;
}
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))