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/dev/tr7zw/yatopia/YatopiaConfig.java b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
2020-08-22 21:11:04 +02:00
|
|
|
index 039255d795f0e00b2a40861aa05c38c11db425cd..729e6d5fa5d3abd77d07defb0dbd5b2c960a0889 100644
|
2020-08-06 20:54:26 +02:00
|
|
|
--- a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
|
|
|
+++ b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
2020-08-22 21:11:04 +02:00
|
|
|
@@ -226,4 +226,9 @@ public class YatopiaConfig {
|
2020-08-13 17:53:32 +02:00
|
|
|
simplerVillagerBehavior = getBoolean("settings.villager.simplerVillagerBehavior", false);
|
2020-08-06 20:54:26 +02:00
|
|
|
villagersHideAtNight = getBoolean("settings.villager.villagersHideAtNight", false);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public static boolean fixFallDistance = false;
|
|
|
|
+ private static void fixFallDistance() {
|
2020-08-13 17:53:32 +02:00
|
|
|
+ fixFallDistance = getBoolean("settings.fixFallDistance", false);
|
2020-08-06 20:54:26 +02:00
|
|
|
+ }
|
2020-08-15 18:18:36 +02:00
|
|
|
}
|
2020-08-06 20:54:26 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2020-08-22 21:11:04 +02:00
|
|
|
index 4cab3f19366a1ea0d6708011e83e4e44b7eff875..55916c77365076450e6c1b6c7e530433172d95c7 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-08-11 20:40:29 +02:00
|
|
|
+ } else if (d0 > 0.0D && dev.tr7zw.yatopia.YatopiaConfig.fixFallDistance) { // Yatopia
|
2020-08-13 17:53:32 +02:00
|
|
|
+ this.fallDistance = 0.0F; // Yatopia
|
2020-08-06 20:54:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|