Yatopia/patches/server/0025-Fix-lead-fall-dmg-config.patch

34 lines
1.7 KiB
Diff
Raw Normal View History

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 d224b1d0e224853e825486559938aed2c56c3981..0bca08dc6ffd367de7cffab0433900d6bfe555cf 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Updated Upstream and Sidestream(s) (Tuinity/Akarin/EMC/Purpur) 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: fea2c2b Updated Upstream (Paper) 490c26a Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4 8056d13 Setup bstats page 44f5e54 Updated Upstream (Paper) Akarin Changes: b53f48a Update Jenkinsfile 1e9cf1a Update SUPPORT.md b9255e8 kinda useless when we have jenkins f6e4782 Update Jenkinsfile 5ecf3fe Update Jenkinsfile cbd236b Updated JenkinsFile 0d2ff08 Removed Gradle 2dab0a4 Removed gradle EMC Changes: 90b678ea Updated Paper ce669f9f Clear bukkit chunk tempmeta on reload a524531d Improve vehicle/passenger teleporting patch 42b3f944 Update README.md (#8) 3e1aa746 Add sender uuid to chat messages a27a3a8f Updated Paper Purpur Changes: 7174d63 PaperPR - Projectile load/save limit per chunk 61d72c7 Add boat fall damage config 7403d46 Fix patch number 40d8df2 Add configurable entity left handedness chance 93e08ee Fix patch header and comments from last commit :3 ed192b6 Add Origami's patch to fix ProtocolLib on Java 15 7eb96ff Left handed API 3224b2b Better name for an OBFHELPER 9ec6496 Missed an OBFHELPER 7f93289 Add demo command 3b68476 Fix build a5fc52c Updated Upstream (Paper) 67ebb28 Optimize EntityMoveEvent detection 585fad0 Add RidableMoveEvent c835ce8 PaperPR - Expose world spawn angle 6a209ef Zombie break door minimum difficulty option 8c4de5c Updated Upstream (Paper & Tuinity)
2020-12-01 08:42:51 +01:00
@@ -1290,6 +1290,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);
+ }
}