2020-08-06 20:54:26 +02:00
|
|
|
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
|
2020-10-11 19:37:55 +02:00
|
|
|
index 585b8c341e83a50714af2b35ea875ddeef38a826..e0381ed6945f734f8802d07b8cbd6b27852db449 100644
|
2020-08-06 20:54:26 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2020-09-20 20:45:23 +02:00
|
|
|
@@ -1264,6 +1264,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2020-08-06 20:54:26 +02:00
|
|
|
this.fallDistance = 0.0F;
|
|
|
|
} else if (d0 < 0.0D) {
|
|
|
|
this.fallDistance = (float) ((double) this.fallDistance - d0);
|
2020-09-01 08:38:17 +02:00
|
|
|
+ } else if (d0 > 0.0D && net.yatopia.server.YatopiaConfig.fixFallDistance) { // Yatopia
|
2020-08-13 17:53:32 +02:00
|
|
|
+ this.fallDistance = 0.0F; // Yatopia
|
2020-08-06 20:54:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2020-09-01 08:38:17 +02:00
|
|
|
diff --git a/src/main/java/net/yatopia/server/YatopiaConfig.java b/src/main/java/net/yatopia/server/YatopiaConfig.java
|
2020-09-15 07:43:13 +02:00
|
|
|
index eb53176099103172961d544c0dab17cc19ef2e7f..b0dac509dddd576742308b687048e432fcf0484f 100644
|
2020-09-01 08:38:17 +02:00
|
|
|
--- a/src/main/java/net/yatopia/server/YatopiaConfig.java
|
|
|
|
+++ b/src/main/java/net/yatopia/server/YatopiaConfig.java
|
2020-09-15 07:43:13 +02:00
|
|
|
@@ -207,4 +207,9 @@ public class YatopiaConfig {
|
2020-09-01 08:38:17 +02:00
|
|
|
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);
|
|
|
|
+ }
|
|
|
|
}
|