twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-06 07:02:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename some methods per discussion in channel

Browse Source
This commit is contained in:
Aikar
2018-09-09 21:45:54 -04:00
parent cc238c61a0
commit 14d6ee0495
2 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Spigot-Server-Patches/Mob-Pathfinding-API.patch
View File

@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
new file mode 100644
index 0000000000..d166bcdd28
index 0000000000..ed3d86ddd3
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
@@ -0,0 +0,0 @@
@@ -46,20 +46,20 @@ index 0000000000..d166bcdd28
+ }
+
+ @Override
+ public boolean hasDestination() {
+ public boolean hasPath() {
+ return entity.getNavigation().getPathEntity() != null;
+ }
+
+ @Nullable
+ @Override
+ public PathResult getCurrentDestination() {
+ public PathResult getCurrentPath() {
+ PathEntity path = entity.getNavigation().getPathEntity();
+ return path != null ? new PaperPathResult(path) : null;
+ }
+
+ @Nullable
+ @Override
+ public PathResult calculateDestination(Location loc) {
+ public PathResult findPath(Location loc) {
+ Validate.notNull(loc, "Location can not be null");
+ PathEntity path = entity.getNavigation().calculateDestination(loc.getX(), loc.getY(), loc.getZ());
+ return path != null ? new PaperPathResult(path) : null;
@@ -67,18 +67,17 @@ index 0000000000..d166bcdd28
+
+ @Nullable
+ @Override
+ public PathResult calculateDestination(LivingEntity target) {
+ public PathResult findPath(LivingEntity target) {
+ Validate.notNull(target, "Target can not be null");
+ PathEntity path = entity.getNavigation().calculateDestination(((CraftLivingEntity) target).getHandle());
+ return path != null ? new PaperPathResult(path) : null;
+ }
+
+ @Override
+ public boolean setDestination(@Nonnull PathResult path, double speed) {
+ public boolean moveTo(@Nonnull PathResult path, double speed) {
+ Validate.notNull(path, "PathResult can not be null");
+ PathEntity pathEntity = ((PaperPathResult) path).path;
+ entity.getNavigation().setDestination(pathEntity, speed);
+ return false;
+ return entity.getNavigation().setDestination(pathEntity, speed);
+ }
+
+ public class PaperPathResult implements com.destroystokyo.paper.entity.PaperPathfinder.PathResult {
@@ -90,7 +89,7 @@ index 0000000000..d166bcdd28
+
+ @Nullable
+ @Override
+ public Location getLocation() {
+ public Location getFinalPoint() {
+ PathPoint point = path.getFinalPoint();
+ return point != null ? toLoc(point) : null;
+ }
@@ -113,7 +112,7 @@ index 0000000000..d166bcdd28
+
+ @Nullable
+ @Override
+ public Location getNextPointLocation() {
+ public Location getNextPoint() {
+ if (!path.hasNext()) {
+ return null;
+ }