mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-11-14 22:56:29 +01:00
d065d41c0e
Apparently caused issues we werent aware of. Unfortunately there's no way to improve it without blocking the main thread.
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
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 2058627ae1322b439c0b8513708145112f791d49..798ce0029c980d340d74dff53d702ef3cd00e33e 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);
|
|
+ }
|
|
}
|