2017-01-20 12:21:44 +01:00
|
|
|
From 3160b608ea40ce14bc154c44bf69d2b217d565dd Mon Sep 17 00:00:00 2001
|
2016-12-20 05:08:31 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 19 Dec 2016 23:07:42 -0500
|
|
|
|
Subject: [PATCH] Prevent Pathfinding out of World Border
|
|
|
|
|
|
|
|
This prevents Entities from trying to run outside of the World Border
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
2016-12-20 23:34:27 +01:00
|
|
|
index c0ef240..74d1fd6 100644
|
2016-12-20 05:08:31 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
|
|
|
@@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
|
|
|
|
|
|
|
|
@Nullable
|
|
|
|
public PathEntity a(BlockPosition blockposition) {
|
|
|
|
+ if (!getEntity().getWorld().getWorldBorder().isInBounds(blockposition)) return null; // Paper - don't path out of world border
|
|
|
|
if (!this.b()) {
|
|
|
|
return null;
|
|
|
|
} else if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
|
|
|
|
@@ -95,6 +96,7 @@ public abstract class NavigationAbstract {
|
|
|
|
return null;
|
|
|
|
} else {
|
|
|
|
BlockPosition blockposition = new BlockPosition(entity);
|
|
|
|
+ if (!getEntity().getWorld().getWorldBorder().isInBounds(blockposition)) return null; // Paper - don't path out of world border
|
|
|
|
|
|
|
|
if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
|
|
|
|
return this.c;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
|
2016-12-20 23:34:27 +01:00
|
|
|
index 9038d52..632eb1c 100644
|
2016-12-20 05:08:31 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldBorder.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldBorder.java
|
|
|
|
@@ -29,7 +29,7 @@ public class WorldBorder {
|
|
|
|
this.l = 5;
|
|
|
|
}
|
|
|
|
|
|
|
|
- public boolean a(BlockPosition blockposition) {
|
|
|
|
+ public boolean isInBounds(BlockPosition blockposition) { return a(blockposition); }public boolean a(BlockPosition blockposition) { // Paper - OBFHELPER
|
|
|
|
return (double) (blockposition.getX() + 1) > this.b() && (double) blockposition.getX() < this.d() && (double) (blockposition.getZ() + 1) > this.c() && (double) blockposition.getZ() < this.e();
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2016-12-20 23:34:27 +01:00
|
|
|
2.9.3
|
2016-12-20 05:08:31 +01:00
|
|
|
|