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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6bfd58a34224b22857a647b21c35068f911a3d26..4492f2579da79bd58def922894f40422fbeaf54c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1396,6 +1396,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
             this.fallDistance = 0.0F;
         } else if (d0 < 0.0D) {
             this.fallDistance = (float) ((double) this.fallDistance - d0);
+        } else if (d0 > 0.0D && org.yatopiamc.yatopia.server.YatopiaConfig.fixFallDistance) { // Yatopia
+            this.fallDistance = 0.0F; // Yatopia
         }
 
     }
diff --git a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
index 0f3803757a81c7ecaad48637ede8a3dc95b93f13..003a024da8ab877895244ff9e4e4ff62288622ff 100644
--- a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
+++ b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
@@ -206,4 +206,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);
+    }
 }