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

Friendly NPCs should not attack each other.

Browse Source
This commit is contained in:
MobiusDev 2017-10-01 22:27:11 +00:00
parent 24f75460d0
commit 42e75417d4
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -53,7 +53,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public boolean isAutoAttackable(L2Character attacker) public boolean isAutoAttackable(L2Character attacker)
{ {
return _isAutoAttackable && !attacker.isPlayable(); return _isAutoAttackable && !attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance);
} }
@Override @Override
@ -65,7 +65,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public void addDamage(L2Character attacker, int damage, Skill skill) public void addDamage(L2Character attacker, int damage, Skill skill)
{ {
if (!attacker.isPlayable()) if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance))
{ {
super.addDamage(attacker, damage, skill); super.addDamage(attacker, damage, skill);
} }
@ -79,7 +79,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public void addDamageHate(L2Character attacker, int damage, int aggro) public void addDamageHate(L2Character attacker, int damage, int aggro)
{ {
if (!attacker.isPlayable()) if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance))
{ {
super.addDamageHate(attacker, damage, aggro); super.addDamageHate(attacker, damage, aggro);
} }

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -53,7 +53,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public boolean isAutoAttackable(L2Character attacker) public boolean isAutoAttackable(L2Character attacker)
{ {
return _isAutoAttackable && !attacker.isPlayable(); return _isAutoAttackable && !attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance);
} }
@Override @Override
@ -65,7 +65,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public void addDamage(L2Character attacker, int damage, Skill skill) public void addDamage(L2Character attacker, int damage, Skill skill)
{ {
if (!attacker.isPlayable()) if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance))
{ {
super.addDamage(attacker, damage, skill); super.addDamage(attacker, damage, skill);
} }
@ -79,7 +79,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public void addDamageHate(L2Character attacker, int damage, int aggro) public void addDamageHate(L2Character attacker, int damage, int aggro)
{ {
if (!attacker.isPlayable()) if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance))
{ {
super.addDamageHate(attacker, damage, aggro); super.addDamageHate(attacker, damage, aggro);
} }

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -53,7 +53,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public boolean isAutoAttackable(L2Character attacker) public boolean isAutoAttackable(L2Character attacker)
{ {
return _isAutoAttackable && !attacker.isPlayable(); return _isAutoAttackable && !attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance);
} }
@Override @Override
@ -65,7 +65,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public void addDamage(L2Character attacker, int damage, Skill skill) public void addDamage(L2Character attacker, int damage, Skill skill)
{ {
if (!attacker.isPlayable()) if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance))
{ {
super.addDamage(attacker, damage, skill); super.addDamage(attacker, damage, skill);
} }
@ -79,7 +79,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public void addDamageHate(L2Character attacker, int damage, int aggro) public void addDamageHate(L2Character attacker, int damage, int aggro)
{ {
if (!attacker.isPlayable()) if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance))
{ {
super.addDamageHate(attacker, damage, aggro); super.addDamageHate(attacker, damage, aggro);
} }

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@ -53,7 +53,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public boolean isAutoAttackable(L2Character attacker) public boolean isAutoAttackable(L2Character attacker)
{ {
return _isAutoAttackable && !attacker.isPlayable(); return _isAutoAttackable && !attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance);
} }
@Override @Override
@ -65,7 +65,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public void addDamage(L2Character attacker, int damage, Skill skill) public void addDamage(L2Character attacker, int damage, Skill skill)
{ {
if (!attacker.isPlayable()) if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance))
{ {
super.addDamage(attacker, damage, skill); super.addDamage(attacker, damage, skill);
} }
@ -79,7 +79,7 @@ public class FriendlyNpcInstance extends L2Attackable
@Override @Override
public void addDamageHate(L2Character attacker, int damage, int aggro) public void addDamageHate(L2Character attacker, int damage, int aggro)
{ {
if (!attacker.isPlayable()) if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpcInstance))
{ {
super.addDamageHate(attacker, damage, aggro); super.addDamageHate(attacker, damage, aggro);
} }