Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-08 03:39:48 +01:00
Code Issues Projects Releases Wiki Activity
658eca0c22
Paper/Spigot-Server-Patches/0175-Prevent-Pathfinding-out-of-World-Border.patch

44 lines
2.1 KiB
Diff
Raw Normal View History

Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 07:00:51 +01:00
From f97ce877b21aaf45ddfed74d21060dd6f4f336fe Mon Sep 17 00:00:00 2001
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
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
Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 07:00:51 +01:00
index 3ac6f84d3..935b2e81e 100644
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
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
Update to MC 1.12-pre2
2017-05-14 20:05:01 +02:00
public PathEntity b(BlockPosition blockposition) {
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
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)) {
@@ -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
Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 07:00:51 +01:00
index 9038d52eb..632eb1c9d 100644
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
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();
}
--
Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 07:00:51 +01:00
2.16.1
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
2016-12-20 05:08:31 +01:00
Reference in New Issue Copy Permalink