NOT WORKING! Even even more patches!

Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch

@@ -9,7 +9,7 @@ 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 4b9bf3b4f..2ba3bcb8e 100644
+index f64a5ef35..5df8b1143 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -28,17 +28,15 @@ index 4b9bf3b4f..2ba3bcb8e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 9d201b14e..57fcc3c05 100644
+index abfd9adbd..dcc14aa11 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ 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.u_();
--            BlockPosition blockposition = world.a(this.b, imerchant.v_(), true);
+             World world = imerchant.getWorld();
 +            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.getPosition(), 100);
  
              if (blockposition != null) {
-                 ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 --