From 7ed82a5f1625536217b8d9d482843c3b44fc24dc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps Allow configuring for cartographers to return the same map location Also allow turning off treasure maps all together as they can eat up Map ID's which are limited in quantity. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java index 4892113a15..406bc611c1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -310,4 +310,14 @@ public class PaperWorldConfig { Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk"); } } + + public boolean enableTreasureMaps = true; + public boolean treasureMapsAlreadyDiscovered = false; + private void treasureMapsAlreadyDiscovered() { + enableTreasureMaps = getBoolean("enable-treasure-maps", true); + treasureMapsAlreadyDiscovered = getBoolean("treasure-maps-return-already-discovered", false); + if (treasureMapsAlreadyDiscovered) { + log("Treasure Maps will return already discovered locations"); + } + } } diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java index 2a4e4f7859..0b66323698 100644 --- a/src/main/java/net/minecraft/server/VillagerTrades.java +++ b/src/main/java/net/minecraft/server/VillagerTrades.java @@ -89,6 +89,7 @@ public class VillagerTrades { @Override public MerchantRecipe a(Entity entity, Random random) { World world = entity.world; + if (!world.paperConfig.enableTreasureMaps) return null; //Paper BlockPosition blockposition = world.a(this.b, new BlockPosition(entity), 100, true); if (blockposition != null) { -- 2.22.0