Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 22:13:42 +01:00
Code Issues Projects Releases Wiki Activity

Re-implement treasure-maps-return-already-discovered for 1.14 (#2636)

Browse Source
This commit is contained in:
Jonathan Frederick 2019-10-18 08:14:43 -07:00 committed by Shane Freeder
parent 8260cdf8c1
commit 2c8d20406f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/0134-Configurable-Cartographer-Treasure-Maps.patch
View File

@ -1,4 +1,4 @@
From ea4b1c7e6c9ea1cff1f6a48fa97087f63531c4d1 Mon Sep 17 00:00:00 2001 From f3fbc261cc75b70ebd3722190f12e04ef7ef0f75 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:26:27 -0500 Date: Tue, 20 Dec 2016 15:26:27 -0500
Subject: [PATCH] Configurable Cartographer Treasure Maps Subject: [PATCH] Configurable Cartographer Treasure Maps
@ -28,17 +28,19 @@ index 11b0f11a8..46d525223 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
index 2a4e4f785..0b6632369 100644 index 8cee460bd..99374fe2a 100644
--- a/src/main/java/net/minecraft/server/VillagerTrades.java --- a/src/main/java/net/minecraft/server/VillagerTrades.java
+++ b/src/main/java/net/minecraft/server/VillagerTrades.java +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
@@ -89,6 +89,7 @@ public class VillagerTrades { @@ -89,7 +89,8 @@ public class VillagerTrades {
@Override @Override
public MerchantRecipe a(Entity entity, Random random) { public MerchantRecipe a(Entity entity, Random random) {
World world = entity.world; World world = entity.world;
- BlockPosition blockposition = world.a(this.b, new BlockPosition(entity), 100, true);
+ if (!world.paperConfig.enableTreasureMaps) return null; //Paper + if (!world.paperConfig.enableTreasureMaps) return null; //Paper
BlockPosition blockposition = world.a(this.b, new BlockPosition(entity), 100, true); + BlockPosition blockposition = world.a(this.b, new BlockPosition(entity), 100, !world.paperConfig.treasureMapsAlreadyDiscovered); //Paper
if (blockposition != null) { if (blockposition != null) {
ItemStack itemstack = ItemWorldMap.createFilledMapView(world, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true);
-- --
2.22.0 2.23.0