2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-07-15 03:53:17 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Thu, 31 Mar 2016 19:17:58 -0400
|
2018-10-05 05:31:01 +02:00
|
|
|
Subject: [PATCH] Do not load chunks for Pathfinding
|
2018-07-15 03:53:17 +02:00
|
|
|
|
|
|
|
|
2018-10-05 05:18:46 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
2020-08-25 04:22:08 +02:00
|
|
|
index 8c51ab85ed4ef23f049fcbfac93e39ab739194cf..35de4e5be6bc0f3660ec795e41fa71d622662987 100644
|
2018-10-05 05:18:46 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
2020-06-25 13:00:35 +02:00
|
|
|
@@ -27,7 +27,7 @@ public abstract class NavigationAbstract {
|
|
|
|
private BlockPosition p;
|
|
|
|
private int q;
|
|
|
|
private float r;
|
|
|
|
- private final Pathfinder s;
|
|
|
|
+ private final Pathfinder s; public Pathfinder getPathfinder() { return this.s; } // Paper - OBFHELPER
|
2018-10-05 05:18:46 +02:00
|
|
|
|
|
|
|
public NavigationAbstract(EntityInsentient entityinsentient, World world) {
|
2019-01-01 04:15:55 +01:00
|
|
|
this.g = Vec3D.a;
|
2018-10-05 05:18:46 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
|
2020-06-25 13:00:35 +02:00
|
|
|
index 8ba6dd459a863717c91dd59f3f2ee5e3a5ed8170..b31d1f73ce0f067e352868b53eab7557c34b17eb 100644
|
2018-10-05 05:18:46 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Pathfinder.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Pathfinder.java
|
2020-06-25 13:00:35 +02:00
|
|
|
@@ -17,7 +17,7 @@ public class Pathfinder {
|
|
|
|
|
|
|
|
private final PathPoint[] a = new PathPoint[32];
|
|
|
|
private final int b;
|
|
|
|
- private final PathfinderAbstract c;
|
|
|
|
+ private final PathfinderAbstract c; public PathfinderAbstract getPathfinder() { return this.c; } // Paper - OBFHELPER
|
|
|
|
private final Path d = new Path();
|
2018-10-05 05:18:46 +02:00
|
|
|
|
2019-04-27 05:05:36 +02:00
|
|
|
public Pathfinder(PathfinderAbstract pathfinderabstract, int i) {
|
2018-10-05 05:18:46 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
|
2020-08-25 04:22:08 +02:00
|
|
|
index 40fd404fd3d7715efb1eeee4f1715acc2368c577..a0555b132d6ddd2c6c259ae569e411606e496d1d 100644
|
2018-10-05 05:18:46 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PathfinderNormal.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
|
2020-08-25 04:22:08 +02:00
|
|
|
@@ -456,7 +456,12 @@ public class PathfinderNormal extends PathfinderAbstract {
|
2020-06-25 13:00:35 +02:00
|
|
|
for (int j1 = -1; j1 <= 1; ++j1) {
|
|
|
|
if (l != 0 || j1 != 0) {
|
|
|
|
blockposition_mutableblockposition.d(i + l, j + i1, k + j1);
|
|
|
|
- IBlockData iblockdata = iblockaccess.getType(blockposition_mutableblockposition);
|
|
|
|
+ // Paper start
|
|
|
|
+ IBlockData iblockdata = iblockaccess.getTypeIfLoaded(blockposition_mutableblockposition);
|
|
|
|
+ if (iblockdata == null) {
|
|
|
|
+ pathtype = PathType.BLOCKED;
|
|
|
|
+ } else {
|
|
|
|
+ // Paper end
|
2019-01-01 04:15:55 +01:00
|
|
|
|
2020-06-25 13:00:35 +02:00
|
|
|
if (iblockdata.a(Blocks.CACTUS)) {
|
|
|
|
return PathType.DANGER_CACTUS;
|
2020-08-25 04:22:08 +02:00
|
|
|
@@ -473,6 +478,7 @@ public class PathfinderNormal extends PathfinderAbstract {
|
|
|
|
if (iblockaccess.getFluid(blockposition_mutableblockposition).a((Tag) TagsFluid.WATER)) {
|
|
|
|
return PathType.WATER_BORDER;
|
2020-06-25 13:00:35 +02:00
|
|
|
}
|
|
|
|
+ } // Paper
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-08-25 04:22:08 +02:00
|
|
|
@@ -482,7 +488,8 @@ public class PathfinderNormal extends PathfinderAbstract {
|
2020-06-25 13:00:35 +02:00
|
|
|
}
|
2018-10-05 05:18:46 +02:00
|
|
|
|
2020-06-25 13:00:35 +02:00
|
|
|
protected static PathType b(IBlockAccess iblockaccess, BlockPosition blockposition) {
|
2018-10-05 05:18:46 +02:00
|
|
|
- IBlockData iblockdata = iblockaccess.getType(blockposition);
|
2019-05-27 08:14:14 +02:00
|
|
|
+ IBlockData iblockdata = iblockaccess.getTypeIfLoaded(blockposition); // Paper
|
2018-10-05 05:18:46 +02:00
|
|
|
+ if (iblockdata == null) return PathType.BLOCKED; // Paper
|
|
|
|
Block block = iblockdata.getBlock();
|
|
|
|
Material material = iblockdata.getMaterial();
|
2019-01-01 04:15:55 +01:00
|
|
|
|