Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-27 21:29:14 +01:00
Code Issues Projects Releases Wiki Activity

Use default strategy if the attack strategy returns false

Browse Source
This commit is contained in:
fullwall 2013-08-02 13:49:53 +08:00
parent 7911d70c73
commit 8457671a6e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
View File

@ -121,6 +121,8 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
if (aggro && canAttack()) { if (aggro && canAttack()) {
AttackStrategy strategy = parameters.attackStrategy(); AttackStrategy strategy = parameters.attackStrategy();
if (strategy != null && strategy.handle((LivingEntity) handle.getBukkitEntity(), getTarget())) { if (strategy != null && strategy.handle((LivingEntity) handle.getBukkitEntity(), getTarget())) {
} else if (strategy != parameters.defaultAttackStrategy()) {
parameters.defaultAttackStrategy().handle((LivingEntity) handle.getBukkitEntity(), getTarget());
} }
attackTicks = ATTACK_DELAY_TICKS; attackTicks = ATTACK_DELAY_TICKS;
} }