mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-21 07:09:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
bd4280b9ec
Paper/Spigot-Server-Patches/0154-Prevent-Pathfinding-out-of-World-Border.patch

44 lines
2.2 KiB
Diff
Raw Normal View History

Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
From f35437d281706ae7e892fd454f2bd8035bbafde9 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 12:08:31 +08: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
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
index a8b070ed32..452da80f11 100644
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
2016-12-20 12:08:31 +08:00
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
@@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
2016-12-20 12:08:31 +08:00
@Nullable
Update to MC 1.12-pre2
2017-05-15 02:05:01 +08: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 12:08:31 +08: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)) {
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
@@ -93,6 +94,7 @@ public abstract class NavigationAbstract {
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
2016-12-20 12:08:31 +08: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;
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
} else {
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
2016-12-20 12:08:31 +08:00
diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
2018-08-27 02:11:49 +08:00
index acd76e13bb..1a87480f09 100644
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
2016-12-20 12:08:31 +08:00
--- a/src/main/java/net/minecraft/server/WorldBorder.java
+++ b/src/main/java/net/minecraft/server/WorldBorder.java
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
2018-08-27 02:11:49 +08:00
@@ -19,7 +19,7 @@ public class WorldBorder {
public WorldBorder() {}
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
2016-12-20 12:08:31 +08: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();
}
--
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 15:55:24 +08:00
2.18.0
Prevent Pathfinding out of World Border - Fixes #547 This prevents Entities from trying to run outside of the World Border
2016-12-20 12:08:31 +08:00
Reference in New Issue Copy Permalink