2018-08-26 20:11:49 +02:00
|
|
|
From a51800a28e394769c3410665328f4e43337f980b 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
|
2018-07-23 10:39:55 +02:00
|
|
|
index 76d1f4bd21..76b2787bae 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
|
2018-07-17 22:32:05 +02:00
|
|
|
@@ -73,6 +73,7 @@ public abstract class NavigationAbstract {
|
2016-12-20 05:08:31 +01:00
|
|
|
|
|
|
|
@Nullable
|
2017-05-14 20:05:01 +02:00
|
|
|
public PathEntity b(BlockPosition blockposition) {
|
2016-12-20 05:08:31 +01:00
|
|
|
+ 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)) {
|
2018-07-17 22:32:05 +02:00
|
|
|
@@ -99,6 +100,7 @@ public abstract class NavigationAbstract {
|
2016-12-20 05:08:31 +01:00
|
|
|
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
|
2018-08-26 20:11:49 +02:00
|
|
|
index acd76e13bb..1a87480f09 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
|
2018-08-26 20:11:49 +02:00
|
|
|
@@ -19,7 +19,7 @@ public class WorldBorder {
|
|
|
|
|
|
|
|
public WorldBorder() {}
|
2016-12-20 05:08:31 +01:00
|
|
|
|
|
|
|
- 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();
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2018-07-04 09:55:24 +02:00
|
|
|
2.18.0
|
2016-12-20 05:08:31 +01:00
|
|
|
|