aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch')
-rw-r--r--patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch
new file mode 100644
index 0000000000..b4596cd20b
--- /dev/null
+++ b/patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Tue, 20 Dec 2016 15:15:11 -0500
+Subject: [PATCH] Bound Treasure Maps to World Border
+
+Make it so a Treasure Map does not target a structure outside of the
+World Border, where players are not even able to reach.
+
+This also would help the case where a players close to the border, and one
+that is outside happens to be closer, but unreachable, yet another reachable
+one is in border that would of been missed.
+
+diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
+index a3ba3a09378e3bd0517464130ad2c702b0b0165d..3442e33a1146318228c4727a2a5afde685f69bf7 100644
+--- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java
++++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
+@@ -46,6 +46,18 @@ public class WorldBorder {
+ return this.isWithinBounds((double) chunkPos.getMinBlockX(), (double) chunkPos.getMinBlockZ()) && this.isWithinBounds((double) chunkPos.getMaxBlockX(), (double) chunkPos.getMaxBlockZ());
+ }
+
++ // Paper start - Bound treasure maps to world border
++ private final BlockPos.MutableBlockPos mutPos = new BlockPos.MutableBlockPos();
++ public boolean isBlockInBounds(int chunkX, int chunkZ) {
++ this.mutPos.set(chunkX, 64, chunkZ);
++ return this.isWithinBounds(this.mutPos);
++ }
++ public boolean isChunkInBounds(int chunkX, int chunkZ) {
++ this.mutPos.set(((chunkX << 4) + 15), 64, (chunkZ << 4) + 15);
++ return this.isWithinBounds(this.mutPos);
++ }
++ // Paper end - Bound treasure maps to world border
++
+ public boolean isWithinBounds(AABB box) {
+ return this.isWithinBounds(box.minX, box.minZ, box.maxX - 9.999999747378752E-6D, box.maxZ - 9.999999747378752E-6D);
+ }
+diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+index a53fa9bebdd46939a710e46466ca9a350ecefb27..0a779632c9d11496fcfc147870fba2699d9cc274 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
++++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+@@ -222,6 +222,7 @@ public abstract class ChunkGenerator {
+
+ while (iterator.hasNext()) {
+ ChunkPos chunkcoordintpair = (ChunkPos) iterator.next();
++ if (!world.paperConfig().environment.locateStructuresOutsideWorldBorder && !world.getWorldBorder().isChunkInBounds(chunkcoordintpair.x, chunkcoordintpair.z)) { continue; } // Paper - Bound treasure maps to world border
+
+ blockposition_mutableblockposition.set(SectionPos.sectionToBlockCoord(chunkcoordintpair.x, 8), 32, SectionPos.sectionToBlockCoord(chunkcoordintpair.z, 8));
+ double d1 = blockposition_mutableblockposition.distSqr(center);