47 Zeilen
3.5 KiB
Diff
47 Zeilen
3.5 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/net/minecraft/world/entity/npc/VillagerTrades.java b/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java
|
|
index 43fb44b8cd164b0815335a32f04879b301a54728..318b7c7cb2a88e8d4dc4456154431fe7bfe2e0dc 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java
|
|
@@ -451,7 +451,8 @@ public class VillagerTrades {
|
|
return null;
|
|
} else {
|
|
ServerLevel serverLevel = (ServerLevel)entity.level();
|
|
- BlockPos blockPos = serverLevel.findNearestMapStructure(this.destination, entity.blockPosition(), 100, true);
|
|
+ if (!serverLevel.paperConfig().environment.treasureMaps.enabled) return null; // Paper - Configurable cartographer treasure maps
|
|
+ BlockPos blockPos = serverLevel.findNearestMapStructure(this.destination, entity.blockPosition(), 100, !serverLevel.paperConfig().environment.treasureMaps.findAlreadyDiscoveredVillager); // Paper - Configurable cartographer treasure maps
|
|
if (blockPos != null) {
|
|
ItemStack itemStack = MapItem.create(serverLevel, blockPos.getX(), blockPos.getZ(), (byte)2, true, true);
|
|
MapItem.renderBiomePreviewMap(serverLevel, itemStack);
|
|
diff --git a/src/main/java/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java b/src/main/java/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java
|
|
index dcc6da6641e78cd80bd148ba644475811a1fbf4d..76b6544e75e52f931bed5bd9b25eda41957beaf7 100644
|
|
--- a/src/main/java/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java
|
|
+++ b/src/main/java/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java
|
|
@@ -75,7 +75,16 @@ public class ExplorationMapFunction extends LootItemConditionalFunction {
|
|
Vec3 vec3 = context.getParamOrNull(LootContextParams.ORIGIN);
|
|
if (vec3 != null) {
|
|
ServerLevel serverLevel = context.getLevel();
|
|
- BlockPos blockPos = serverLevel.findNearestMapStructure(this.destination, BlockPos.containing(vec3), this.searchRadius, this.skipKnownStructures);
|
|
+ // Paper start - Configurable cartographer treasure maps
|
|
+ if (!serverLevel.paperConfig().environment.treasureMaps.enabled) {
|
|
+ /*
|
|
+ * NOTE: I fear users will just get a plain map as their "treasure"
|
|
+ * This is preferable to disrespecting the config.
|
|
+ */
|
|
+ return stack;
|
|
+ }
|
|
+ BlockPos blockPos = serverLevel.findNearestMapStructure(this.destination, BlockPos.containing(vec3), this.searchRadius, !serverLevel.paperConfig().environment.treasureMaps.findAlreadyDiscoveredLootTable.or(!this.skipKnownStructures));
|
|
+ // Paper end - Configurable cartographer treasure maps
|
|
if (blockPos != null) {
|
|
ItemStack itemStack = MapItem.create(serverLevel, blockPos.getX(), blockPos.getZ(), this.zoom, true, true);
|
|
MapItem.renderBiomePreviewMap(serverLevel, itemStack);
|