From e480031d11f23e07b8c0a792da91a2623e19a5b6 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 29 Jan 2019 16:55:04 +0000 Subject: [PATCH] Fixed summon attacking after BlockActions effect. --- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 34265e7354..5256d7ee9a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 34265e7354..5256d7ee9a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 34265e7354..5256d7ee9a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 34265e7354..5256d7ee9a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 34265e7354..5256d7ee9a 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 34265e7354..5256d7ee9a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java index e621f37c93..9e3aa26196 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java index e621f37c93..9e3aa26196 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java index e621f37c93..9e3aa26196 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java index e621f37c93..9e3aa26196 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -904,7 +904,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) { return; }