Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2025-01-05 21:01:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

rectify Configurable Cartographer Treasure Maps patch

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Shane Freeder 2017-10-30 13:06:35 +00:00
Ursprung 8835dcc6f4
Commit 8381709166
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: A3F61EA5A085289C
1 geänderte Dateien mit 5 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

9
Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 7d2695a42ff73a0761934735c1e8c081aad4c778 Mon Sep 17 00:00:00 2001 From 14b4bae069a80e2ed8da1d85cc671ba19aede3ef Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:26:27 -0500 Date: Tue, 20 Dec 2016 15:26:27 -0500
Subject: [PATCH] Configurable Cartographer Treasure Maps Subject: [PATCH] Configurable Cartographer Treasure Maps
@ -28,18 +28,19 @@ index a80d8b2ac..32ca0a40e 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index ae68f07ab..35221decf 100644 index ae68f07ab..8ba150a45 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java --- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -767,7 +767,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -767,7 +767,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
public void a(IMerchant imerchant, MerchantRecipeList merchantrecipelist, Random random) { public void a(IMerchant imerchant, MerchantRecipeList merchantrecipelist, Random random) {
int i = this.a.a(random); int i = this.a.a(random);
World world = imerchant.u_(); World world = imerchant.u_();
- BlockPosition blockposition = world.a(this.b, imerchant.v_(), true); - BlockPosition blockposition = world.a(this.b, imerchant.v_(), true);
+ if (!world.paperConfig.enableTreasureMaps) return; //Paper
+ BlockPosition blockposition = world.a(this.b, imerchant.v_(), world.paperConfig.treasureMapsAlreadyDiscovered); // Paper - pass false to return first structure, regardless of if its been discovered. true returns only undiscovered. + BlockPosition blockposition = world.a(this.b, imerchant.v_(), world.paperConfig.treasureMapsAlreadyDiscovered); // Paper - pass false to return first structure, regardless of if its been discovered. true returns only undiscovered.
if (blockposition != null) { if (blockposition != null) {
ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true); ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
-- --
2.14.2 2.14.3