From 607f9a373a20595be543b567b39a2c7a4e634f13 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 104a3acf3..13f54e05a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -359,4 +359,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/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java index 213d0b18c..ebe397b15 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -752,6 +752,7 @@ 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.getWorld(); + if (!world.paperConfig.enableTreasureMaps) return; //Paper BlockPosition blockposition = world.a(this.b, imerchant.getPosition(), 100, true); if (blockposition != null) { -- 2.21.0