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

Method isAutoAttackable should consider all war declarations.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-05-22 22:40:09 +00:00
parent c88dcd8ea8
commit 65ed82796c
19 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8220,7 +8220,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8227,7 +8227,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8229,7 +8229,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8224,7 +8224,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8206,7 +8206,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8206,7 +8206,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8207,7 +8207,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8219,7 +8219,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8324,7 +8324,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8350,7 +8350,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8141,7 +8141,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8141,7 +8141,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8127,7 +8127,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8152,7 +8152,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8152,7 +8152,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8103,7 +8103,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8119,7 +8119,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8249,7 +8249,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -1
View File
@@ -8291,7 +8291,7 @@ public class PlayerInstance extends Playable
if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
{ {
final ClanWar war = attackerClan.getWarWith(getClanId()); final ClanWar war = attackerClan.getWarWith(getClanId());
if ((war != null) && (war.getState() == ClanWarState.MUTUAL)) if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
{ {
return true; return true;
} }