Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-09 09:57:45 +01:00
Code Issues Projects Releases Wiki Activity

Path update cooldown for attacking entity goals

Browse Source
This commit is contained in:
Konstantin Shandurenko 2021-04-04 02:56:02 +03:00
parent 4cf66fde08
commit 3f184aad41
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minestom/server/entity/ai/goal/CombinedAttackGoal.java
View File

@ -9,6 +9,7 @@ import net.minestom.server.entity.type.projectile.EntityProjectile;
import net.minestom.server.utils.Position; import net.minestom.server.utils.Position;
import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.Cooldown;
import net.minestom.server.utils.time.TimeUnit; import net.minestom.server.utils.time.TimeUnit;
import net.minestom.server.utils.time.UpdateOption;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -19,6 +20,9 @@ import java.util.function.Function;
*/ */
public class CombinedAttackGoal extends GoalSelector { public class CombinedAttackGoal extends GoalSelector {
private final UpdateOption pathUpdateOptions = new UpdateOption(5, TimeUnit.TICK);
private long lastPathUpdate;
private final int meleeRangeSquared; private final int meleeRangeSquared;
private final int meleeDelay; private final int meleeDelay;
private final TimeUnit meleeTimeUnit; private final TimeUnit meleeTimeUnit;
@ -90,6 +94,10 @@ public class CombinedAttackGoal extends GoalSelector {
Check.argCondition(desirableRange > rangedRange, "Desirable range can not exceed ranged range!"); Check.argCondition(desirableRange > rangedRange, "Desirable range can not exceed ranged range!");
} }
public UpdateOption getPathUpdateOptions() {
return this.pathUpdateOptions;
}
public void setProjectileGenerator(Function<Entity, EntityProjectile> projectileGenerator) { public void setProjectileGenerator(Function<Entity, EntityProjectile> projectileGenerator) {
this.projectileGenerator = projectileGenerator; this.projectileGenerator = projectileGenerator;
} }
@ -159,7 +167,10 @@ public class CombinedAttackGoal extends GoalSelector {
// Otherwise going to the target. // Otherwise going to the target.
Position targetPosition = target.getPosition(); Position targetPosition = target.getPosition();
if (pathPosition == null || !pathPosition.isSimilar(targetPosition)) { if (pathPosition == null || !pathPosition.isSimilar(targetPosition)) {
navigator.setPathTo(targetPosition); if (!Cooldown.hasCooldown(time, this.lastPathUpdate, getPathUpdateOptions())) {
this.lastPathUpdate = time;
navigator.setPathTo(targetPosition);
}
} }
} }

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

@ -8,6 +8,7 @@ import net.minestom.server.entity.pathfinding.Navigator;
import net.minestom.server.utils.Position; import net.minestom.server.utils.Position;
import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.Cooldown;
import net.minestom.server.utils.time.TimeUnit; import net.minestom.server.utils.time.TimeUnit;
import net.minestom.server.utils.time.UpdateOption;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
/** /**
@ -16,6 +17,9 @@ import org.jetbrains.annotations.NotNull;
*/ */
public class MeleeAttackGoal extends GoalSelector { public class MeleeAttackGoal extends GoalSelector {
private final UpdateOption pathUpdateOptions = new UpdateOption(5, TimeUnit.TICK);
private long lastPathUpdate;
private long lastHit; private long lastHit;
private final int delay; private final int delay;
private final TimeUnit timeUnit; private final TimeUnit timeUnit;
@ -37,6 +41,10 @@ public class MeleeAttackGoal extends GoalSelector {
this.timeUnit = timeUnit; this.timeUnit = timeUnit;
} }
public UpdateOption getPathUpdateOptions() {
return this.pathUpdateOptions;
}
@Override @Override
public boolean shouldStart() { public boolean shouldStart() {
this.cachedTarget = findTarget(); this.cachedTarget = findTarget();
@ -77,7 +85,10 @@ public class MeleeAttackGoal extends GoalSelector {
final Position pathPosition = navigator.getPathPosition(); final Position pathPosition = navigator.getPathPosition();
final Position targetPosition = target.getPosition(); final Position targetPosition = target.getPosition();
if (pathPosition == null || !pathPosition.isSimilar(targetPosition)) { if (pathPosition == null || !pathPosition.isSimilar(targetPosition)) {
navigator.setPathTo(targetPosition); if (!Cooldown.hasCooldown(time, this.lastPathUpdate, getPathUpdateOptions())) {
this.lastPathUpdate = time;
navigator.setPathTo(targetPosition);
}
} }
} }
} }

13
src/main/java/net/minestom/server/entity/ai/goal/RangedAttackGoal.java
View File

@ -9,6 +9,7 @@ import net.minestom.server.entity.type.projectile.EntityProjectile;
import net.minestom.server.utils.Position; import net.minestom.server.utils.Position;
import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.Cooldown;
import net.minestom.server.utils.time.TimeUnit; import net.minestom.server.utils.time.TimeUnit;
import net.minestom.server.utils.time.UpdateOption;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -16,6 +17,9 @@ import java.util.function.Function;
public class RangedAttackGoal extends GoalSelector { public class RangedAttackGoal extends GoalSelector {
private final UpdateOption pathUpdateOptions = new UpdateOption(5, TimeUnit.TICK);
private long lastPathUpdate;
private long lastShot; private long lastShot;
private final int delay; private final int delay;
private final TimeUnit timeUnit; private final TimeUnit timeUnit;
@ -52,6 +56,10 @@ public class RangedAttackGoal extends GoalSelector {
Check.argCondition(desirableRange > attackRange, "Desirable range can not exceed attack range!"); Check.argCondition(desirableRange > attackRange, "Desirable range can not exceed attack range!");
} }
public UpdateOption getPathUpdateOptions() {
return this.pathUpdateOptions;
}
public void setProjectileGenerator(Function<Entity, EntityProjectile> projectileGenerator) { public void setProjectileGenerator(Function<Entity, EntityProjectile> projectileGenerator) {
this.projectileGenerator = projectileGenerator; this.projectileGenerator = projectileGenerator;
} }
@ -111,7 +119,10 @@ public class RangedAttackGoal extends GoalSelector {
} }
Position targetPosition = target.getPosition(); Position targetPosition = target.getPosition();
if (pathPosition == null || !pathPosition.isSimilar(targetPosition)) { if (pathPosition == null || !pathPosition.isSimilar(targetPosition)) {
navigator.setPathTo(targetPosition); if (!Cooldown.hasCooldown(time, this.lastPathUpdate, getPathUpdateOptions())) {
this.lastPathUpdate = time;
navigator.setPathTo(targetPosition);
}
} }
} }