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-09-04 08:19:36 +02:00
|
|
|
index 5e4744e856596f1ef234e2c3b1e5d15a3adbd32a..9f9e564ebf2c052bc378ad93a2b03fb322e7dcdb 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-08-16 11:07:31 +02:00
|
|
|
@@ -1266,6 +1266,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
|
|
|
|
index 3499f743e875338f51c2193dff0ded5881ac70b7..349834a9b367f00478448c5be8216a856b4b21c4 100644
|
|
|
|
--- a/src/main/java/net/yatopia/server/YatopiaConfig.java
|
|
|
|
+++ b/src/main/java/net/yatopia/server/YatopiaConfig.java
|
|
|
|
@@ -226,4 +226,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);
|
|
|
|
+ }
|
|
|
|
}
|