From 5e2784e941ba2873facc44b30be906485fcdae95 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 25 Mar 2017 00:22:02 -0500 Subject: Switch to a bStats based Metrics system --- ...5-Configurable-Cartographer-Treasure-Maps.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch (limited to 'Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch') diff --git a/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch new file mode 100644 index 0000000000..db079a6048 --- /dev/null +++ b/Spigot-Server-Patches/0185-Configurable-Cartographer-Treasure-Maps.patch @@ -0,0 +1,46 @@ +From 050363c48f3b9da488e55f8eeed6f6ab536e8a49 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 dcf64efcc..bf2916802 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java ++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +@@ -393,4 +393,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 4ad75468c..ac6e2a9aa 100644 +--- a/src/main/java/net/minecraft/server/EntityVillager.java ++++ b/src/main/java/net/minecraft/server/EntityVillager.java +@@ -761,7 +761,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.t_(); +- BlockPosition blockposition = world.a(this.b, imerchant.u_(), true); ++ if (!world.paperConfig.enableTreasureMaps) return; // Paper ++ BlockPosition blockposition = world.a(this.b, imerchant.u_(), !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.12.0.windows.1 + -- cgit v1.2.3