From e843dbbbd0e91d0c340f74af7d2af441f006ac44 Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <me@notom3ga.me>
Date: Sat, 19 Jun 2021 09:42:54 -0400
Subject: [PATCH] 1 more

---
 ...e-add-farmland-mechanics-from-Alpha.patch} | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 rename patches/{server-unmapped/0121-Ability-to-re-add-farmland-mechanics-from-Alpha.patch => server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch} (59%)

diff --git a/patches/server-unmapped/0121-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 59%
rename from patches/server-unmapped/0121-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
index a4c3052aa..163d9dc09 100644
--- a/patches/server-unmapped/0121-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -4,30 +4,30 @@ Date: Sat, 14 Nov 2020 08:06:20 -0800
 Subject: [PATCH] Ability to re-add farmland mechanics from Alpha
 
 
-diff --git a/src/main/java/net/minecraft/world/level/block/BlockSoil.java b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
-index 2bbaa2fb426869223a9b2f07406496c1b0daff3f..3e8893bf76b8ffda4c595c81086556ea929beaa4 100644
---- a/src/main/java/net/minecraft/world/level/block/BlockSoil.java
-+++ b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
-@@ -113,6 +113,14 @@ public class BlockSoil extends Block {
+diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+index 97e5cb4fd9f97c0bfa9d66c0ceac84e134f1053f..e92f6ffcda47aad76ad647bc2ad3d1862bf24d8a 100644
+--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+@@ -113,6 +113,14 @@ public class FarmBlock extends Block {
                  return;
              }
  
 +            // Purpur start
 +            if (world.purpurConfig.farmlandAlpha) {
-+                Block block = world.getType(blockposition.down()).getBlock();
-+                if (block instanceof BlockFence || block instanceof BlockCobbleWall) {
++                Block block = world.getBlockState(pos.below()).getBlock();
++                if (block instanceof FenceBlock || block instanceof WallBlock) {
 +                    return;
 +                }
 +            }
 +            // Purpur end
-             if (CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) {
+             if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
                  return;
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 30ca0eaf588b7056963e9c6ecb4682608b46a463..44c27c6dd4993add42410373191a46f4cc92f42f 100644
+index 994928c1bc24f836f957563780cbb2c1b415ba44..0fad44563547eb3643019a42d1d38a371df0613d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -405,8 +405,10 @@ public class PurpurWorldConfig {
+@@ -406,8 +406,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean farmlandGetsMoistFromBelow = false;