From 8381709166cf016ba855109bcd335465449e7886 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 30 Oct 2017 13:06:35 +0000 Subject: [PATCH] rectify Configurable Cartographer Treasure Maps patch --- .../0179-Configurable-Cartographer-Treasure-Maps.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch index 3f4a528ad..cee7f7ca8 100644 --- a/Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 7d2695a42ff73a0761934735c1e8c081aad4c778 Mon Sep 17 00:00:00 2001 +From 14b4bae069a80e2ed8da1d85cc671ba19aede3ef Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -28,18 +28,19 @@ index a80d8b2ac..32ca0a40e 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index ae68f07ab..35221decf 100644 +index ae68f07ab..8ba150a45 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java -@@ -767,7 +767,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { +@@ -767,7 +767,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { public void a(IMerchant imerchant, MerchantRecipeList merchantrecipelist, Random random) { int i = this.a.a(random); World world = imerchant.u_(); - BlockPosition blockposition = world.a(this.b, imerchant.v_(), true); ++ if (!world.paperConfig.enableTreasureMaps) return; //Paper + BlockPosition blockposition = world.a(this.b, imerchant.v_(), world.paperConfig.treasureMapsAlreadyDiscovered); // Paper - pass false to return first structure, regardless of if its been discovered. true returns only undiscovered. if (blockposition != null) { ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true); -- -2.14.2 +2.14.3