Skip to content

Allow Mob-caster to be navigator #1094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JasperLorelai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow Mob-caster to be navigator #1094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 32 additions & 6 deletions core/src/main/java/com/nisovin/magicspells/spells/targeted/PathfindToSpell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
import com.nisovin.magicspells.spells.TargetedSpell;
import com.nisovin.magicspells.util.config.ConfigData;
import com.nisovin.magicspells.spells.TargetedEntitySpell;
import com.nisovin.magicspells.spells.TargetedLocationSpell;

import com.destroystokyo.paper.entity.Pathfinder;
import com.destroystokyo.paper.event.entity.EntityPathfindEvent;

public class PathfindToSpell extends TargetedSpell implements TargetedEntitySpell {
public class PathfindToSpell extends TargetedSpell implements TargetedEntitySpell, TargetedLocationSpell {

private static Monitor monitor;

Expand All @@ -37,6 +38,7 @@ public class PathfindToSpell extends TargetedSpell implements TargetedEntitySpel
private final ConfigData<Double> distanceAllowed;

private final ConfigData<Boolean> allowInterrupt;
private final ConfigData<Boolean> forceCasterNavigator;

private Subspell arriveSpell;

Expand All @@ -49,6 +51,7 @@ public PathfindToSpell(MagicConfig config, String spellName) {
distanceAllowed = getConfigDataDouble("distance-allowed", 1);

allowInterrupt = getConfigDataBoolean("allow-interrupt", true);
forceCasterNavigator = getConfigDataBoolean("force-caster-navigator", false);
}

@Override
Expand Down Expand Up @@ -78,19 +81,42 @@ public CastResult cast(SpellData data) {
TargetInfo<LivingEntity> info = getTargetedEntity(data);
if (info.noTarget()) return noTarget(info);

return setPath(info.spellData());
data = info.spellData();
if (!(data.target() instanceof Mob mob)) return noTarget(data);

return setPath(mob, position.get(data).toLocation(mob.getWorld()), data);
}

@Override
public CastResult castAtEntity(SpellData data) {
return setPath(data);
Mob navigator = null;
Location destination = null;

if (forceCasterNavigator.get(data)) {
if (data.caster() instanceof Mob mob) {
navigator = mob;
destination = data.target().getLocation();
}
} else {
if (data.target() instanceof Mob mob) {
navigator = mob;
destination = position.get(data).toLocation(mob.getWorld());
}
}
if (navigator == null) return new CastResult(PostCastAction.ALREADY_HANDLED, data);

return setPath(navigator, destination, data);
}

private CastResult setPath(SpellData data) {
if (!(data.target() instanceof Mob mob)) return noTarget(data);
@Override
public CastResult castAtLocation(SpellData data) {
if (!(data.caster() instanceof Mob navigator))
return new CastResult(PostCastAction.ALREADY_HANDLED, data);

Location destination = position.get(data).toLocation(mob.getWorld());
return setPath(navigator, data.location(), data);
}

private CastResult setPath(Mob mob, Location destination, SpellData data) {
Pathfinder.PathResult path = mob.getPathfinder().findPath(destination);
if (path == null || !path.canReachFinalPoint()) return new CastResult(PostCastAction.ALREADY_HANDLED, data);

Expand Down
Loading