From 75d51d6f9f4ec5e58e0e145b153f93e6ed7a7962 Mon Sep 17 00:00:00 2001 From: Aikar <aikar@aikar.co> Date: Sun, 9 Sep 2018 14:36:51 -0400 Subject: [PATCH] getextPointIndex was not needing to be boxed/nullable --- Spigot-API-Patches/Mob-Pathfinding-API.patch | 4 ++-- Spigot-Server-Patches/Mob-Pathfinding-API.patch | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Spigot-API-Patches/Mob-Pathfinding-API.patch b/Spigot-API-Patches/Mob-Pathfinding-API.patch index f3c5e0a443..fc253ce5cf 100644 --- a/Spigot-API-Patches/Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/Mob-Pathfinding-API.patch @@ -11,7 +11,7 @@ the location. diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java new file mode 100644 -index 000000000..27b6bb696 +index 000000000..78230bd28 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java @@ -0,0 +0,0 @@ @@ -175,7 +175,7 @@ index 000000000..27b6bb696 + * @return Returns the index of the current point along the points returned in {@link #getPoints()} the entity + * is trying to reach, or null if we are done with this pathfinding. + */ -+ @Nullable Integer getNextPointIndex(); ++ int getNextPointIndex(); + + /** + * @return The next location in the path points the entity is trying to reach, or null if there is no next point diff --git a/Spigot-Server-Patches/Mob-Pathfinding-API.patch b/Spigot-Server-Patches/Mob-Pathfinding-API.patch index ab7eec6989..009c0b8c61 100644 --- a/Spigot-Server-Patches/Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/Mob-Pathfinding-API.patch @@ -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..5062594d62 +index 0000000000..d166bcdd28 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java @@ -0,0 +0,0 @@ @@ -106,9 +106,8 @@ index 0000000000..5062594d62 + return points; + } + -+ @Nullable + @Override -+ public Integer getNextPointIndex() { ++ public int getNextPointIndex() { + return path.getNextIndex(); + } +