lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified PartyPledge affect scope logic.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
Vendored
+2 -7
View File
@@ -67,14 +67,9 @@ public class PartyPledge implements IAffectScopeHandler
return false; return false;
} }
if (p != player) if ((p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
{ {
final Party pParty = p.getParty(); return false;
final int pClanId = p.getClanId();
if ((pParty == null) || ((clanId != pClanId) && (party != pParty)))
{
return false;
}
} }
if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p)) if ((affectObject != null) && !affectObject.checkAffectedObject(creature, p))