From bded01f0f5825703f965dd21bb44aea87732454f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 21:28:01 -0500 Subject: [PATCH] continue instead of break for treasure map bounding per: https://github.com/PaperMC/Paper/commit/a5f9077242fdaba3ae77170383c6cd12a2d82c10#commitcomment-20268968 The break may of been skipping attempts at valid chunks. I thought break was the right abort, but maybe it is not. --- .../Bound-Treasure-Maps-to-World-Border.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch index d0107ef7b5..07c0992b53 100644 --- a/Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch @@ -11,7 +11,7 @@ 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/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +index 9c1605b14..77236760f 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -0,0 +0,0 @@ public abstract class StructureGenerator extends WorldGenBase { @@ -19,13 +19,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 WorldGenBase.a(world.getSeed(), random, l2, i3); random.nextInt(); + -+ if (!world.getWorldBorder().isChunkInBounds(l2, i3)) { break; } // Paper ++ if (!world.getWorldBorder().isChunkInBounds(l2, i3)) { continue; } // Paper + if (structuregenerator.a(l2, i3)) { if (!flag1 || !world.b(l2, i3)) { return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8); diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +index 632eb1c9d..1bb172bbf 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -0,0 +0,0 @@ public class WorldBorder {