Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-02 11:21:15 +01:00
Code Issues Projects Releases Wiki Activity

Add range to MeleeAttackGoal

Browse Source
This commit is contained in:
LeoDog896 2021-01-13 07:33:51 -05:00
parent ea8b8ea41e
commit 85a84dbea6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minestom/server/entity/ai/goal/MeleeAttackGoal.java
View File

@ -20,17 +20,20 @@ public class MeleeAttackGoal extends GoalSelector {
private long lastHit;
private final int delay;
private final TimeUnit timeUnit;
private final int range;
private boolean stop;
/**
* @param entityCreature the entity to add the goal to
* @param delay the delay between each attacks
* @param range the allowed range the entity can attack others.
* @param timeUnit the unit of the delay
*/
public MeleeAttackGoal(@NotNull EntityCreature entityCreature, int delay, @NotNull TimeUnit timeUnit) {
public MeleeAttackGoal(@NotNull EntityCreature entityCreature, int delay, int range, @NotNull TimeUnit timeUnit) {
super(entityCreature);
this.delay = delay;
this.range = range;
this.timeUnit = timeUnit;
}
@ -56,7 +59,7 @@ public class MeleeAttackGoal extends GoalSelector {
if (!stop) {
// Attack the target entity
if (entityCreature.getBoundingBox().intersect(target)) {
if (entityCreature.getDistance(target) <= range) {
if (!CooldownUtils.hasCooldown(time, lastHit, timeUnit, delay)) {
entityCreature.attack(target, true);
this.lastHit = time;