Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-30 15:37:40 +02:00
Code Issues Projects Releases Wiki Activity

rectify Configurable Cartographer Treasure Maps patch

Browse Source
This commit is contained in:
Shane Freeder 2017-10-30 13:06:35 +00:00
parent 8835dcc6f4
commit 8381709166
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch
View File

@ -1,4 +1,4 @@
From 7d2695a42ff73a0761934735c1e8c081aad4c778 Mon Sep 17 00:00:00 2001
From 14b4bae069a80e2ed8da1d85cc671ba19aede3ef Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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