mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-12-03 08:05:02 +01:00
58e66daeb4
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: a405b1b Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4 f06591a Updated Upstream (Paper) 48d3556 Prevent light queue overfill when no players are online Origami Changes: 78f4af0 Require Java 11 b70595f Fix patch rebuilding for MojangAPI module 34170a7 Update Paper Purpur Changes: 3d455ff Updated Upstream (Paper & Tuinity) 7152b72 [ci-skip] Use shadowJar output as input for paperclip 822a35a [ci-skip] Publish shadowJar as server artifact f142481 Resolves #125 - Full netherite armor grants fire resistance 5e269e1 Updated Upstream (Paper) AirplaneLite Changes: 9326301 Update upstream, fix utf8
34 lines
1.7 KiB
Diff
34 lines
1.7 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 1ece3e1e9e7a26f1ee07202916687f627c9e4c95..540bd5ccb01789d9130ea64a78dc125f94f94bb6 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -1301,6 +1301,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 && 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);
|
|
+ }
|
|
}
|