63 lines
3.6 KiB
Diff
63 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 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
|
|
|
|
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 e43aee3757b6765d898b50ebfff1a28071638558..255b4081314162cbe344b008158c6f4584795fb8 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -307,4 +307,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/LootItemFunctionExplorationMap.java b/src/main/java/net/minecraft/server/LootItemFunctionExplorationMap.java
|
|
index 32a98e758b9df48005ddc5283eacdc5123a32c39..30f21e3ff7eed3c7291e01b94cc0f66fd48756d0 100644
|
|
--- a/src/main/java/net/minecraft/server/LootItemFunctionExplorationMap.java
|
|
+++ b/src/main/java/net/minecraft/server/LootItemFunctionExplorationMap.java
|
|
@@ -48,6 +48,15 @@ public class LootItemFunctionExplorationMap extends LootItemFunctionConditional
|
|
|
|
if (blockposition != null) {
|
|
WorldServer worldserver = loottableinfo.getWorld();
|
|
+ // Paper start
|
|
+ if (!worldserver.paperConfig.enableTreasureMaps) {
|
|
+ /*
|
|
+ * NOTE: I fear users will just get a plain map as their "treasure"
|
|
+ * This is preferable to disrespecting the config.
|
|
+ */
|
|
+ return itemstack;
|
|
+ }
|
|
+ // Paper end
|
|
BlockPosition blockposition1 = worldserver.a(this.e, blockposition, this.h, this.i);
|
|
|
|
if (blockposition1 != null) {
|
|
diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
|
|
index 532460e7549192dfe6170e2bf489edb46b8b5737..d0c2ec4050458e26d1bd85cc09b1a3fdca8488c6 100644
|
|
--- a/src/main/java/net/minecraft/server/VillagerTrades.java
|
|
+++ b/src/main/java/net/minecraft/server/VillagerTrades.java
|
|
@@ -91,7 +91,8 @@ public class VillagerTrades {
|
|
return null;
|
|
} else {
|
|
WorldServer worldserver = (WorldServer) entity.world;
|
|
- BlockPosition blockposition = worldserver.a(this.b, entity.getChunkCoordinates(), 100, true);
|
|
+ if (!worldserver.paperConfig.enableTreasureMaps) return null; // Paper
|
|
+ BlockPosition blockposition = worldserver.a(this.b, entity.getChunkCoordinates(), 100, !worldserver.paperConfig.treasureMapsAlreadyDiscovered); // Paper
|
|
|
|
if (blockposition != null) {
|
|
ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true);
|