Merge in Tuinity patches

patches/server/0085-Option-for-hay-block-fall-damage.patch

@@ -1,41 +0,0 @@
-From ace2bd7881eeaa98dfd90b67d1d434eb40de1300 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 30 Nov 2019 01:31:09 -0600
-Subject: [PATCH] Option for hay block fall damage
-
----
- src/main/java/net/minecraft/server/BlockHay.java     | 2 +-
- src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/main/java/net/minecraft/server/BlockHay.java b/src/main/java/net/minecraft/server/BlockHay.java
-index ca81c49f0a..1f8f60542f 100644
---- a/src/main/java/net/minecraft/server/BlockHay.java
-+++ b/src/main/java/net/minecraft/server/BlockHay.java
-@@ -9,6 +9,6 @@ public class BlockHay extends BlockRotatable {
- 
-     @Override
-     public void fallOn(World world, BlockPosition blockposition, Entity entity, float f) {
--        entity.b(f, 0.2F);
-+        entity.b(f, world.purpurConfig.hayBlockFallDamage); // Purpur
-     }
- }
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0ca7b9a1fb..5a15980009 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
-         grindstoneBlacklist.addAll(blacklist);
-     }
- 
-+    public float hayBlockFallDamage = 0.2F;
-+    private void hayBlockFallDamage() {
-+        hayBlockFallDamage = (float) getDouble("blocks.hay_block.fall-damage", hayBlockFallDamage);
-+    }
-+
-     public boolean lavaInfinite = false;
-     private void lavaSettings() {
-         lavaInfinite = getBoolean("blocks.lava.infinite-source", lavaInfinite);
--- 
-2.24.0
-