From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Tue, 4 Aug 2020 22:08:09 +0200
Subject: [PATCH] Fix lead fall dmg config


diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1ec7046dd79c07203d7c4a8c60145db9d0ac3b82..898446130f264055eeca2e5de3c30201e05f484a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1264,6 +1264,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
             this.fallDistance = 0.0F;
         } else if (d0 < 0.0D) {
             this.fallDistance = (float) ((double) this.fallDistance - d0);
+        } else if (d0 > 0.0D && net.yatopia.server.YatopiaConfig.fixFallDistance) { // Yatopia
+            this.fallDistance = 0.0F; // Yatopia
         }
 
     }
diff --git a/src/main/java/net/yatopia/server/YatopiaConfig.java b/src/main/java/net/yatopia/server/YatopiaConfig.java
index eb53176099103172961d544c0dab17cc19ef2e7f..b0dac509dddd576742308b687048e432fcf0484f 100644
--- a/src/main/java/net/yatopia/server/YatopiaConfig.java
+++ b/src/main/java/net/yatopia/server/YatopiaConfig.java
@@ -207,4 +207,9 @@ public class YatopiaConfig {
         simplerVillagerBehavior = getBoolean("settings.villager.simplerVillagerBehavior", false);
         villagersHideAtNight = getBoolean("settings.villager.villagersHideAtNight", false);
     }
+
+    public static boolean fixFallDistance = false;
+    private static void fixFallDistance() {
+        fixFallDistance = getBoolean("settings.fixFallDistance", false);
+    }
 }