Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-05 06:51:20 +01:00
Code Issues Projects Releases Wiki Activity

Looking for the closest block to the ground when targeting entities

Browse Source
This commit is contained in:
fullwall 2020-10-08 13:26:41 +08:00
parent 27b0bc107c
commit 38dfb0e42c
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
package net.citizensnpcs.npc.ai;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.util.Vector;
@ -11,6 +13,7 @@ import net.citizensnpcs.api.ai.NavigatorParameters;
import net.citizensnpcs.api.ai.PathStrategy;
import net.citizensnpcs.api.ai.TargetType;
import net.citizensnpcs.api.ai.event.CancelReason;
import net.citizensnpcs.api.astar.pathfinder.MinecraftBlockExaminer;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.util.BoundingBox;
import net.citizensnpcs.util.NMS;
@ -148,6 +151,7 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
@Override
public void setPath() {
// TODO: should use fallback-style pathfinding
setStrategy();
strategy.update();
CancelReason subReason = strategy.getCancelReason();
@ -166,6 +170,17 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
if (location == null) {
throw new IllegalStateException("mapper should not return null");
}
if (!npc.isFlyable()) {
Block block = location.getBlock();
while (!MinecraftBlockExaminer.canStandOn(block.getRelative(BlockFace.DOWN))) {
block = block.getRelative(BlockFace.DOWN);
if (block.getY() <= 0) {
block = location.getBlock();
break;
}
}
location = block.getLocation();
}
strategy = npc.isFlyable() ? new FlyingAStarNavigationStrategy(npc, location, parameters)
: new AStarNavigationStrategy(npc, location, parameters);
}