aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0904-Flying-Fall-Damage.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0904-Flying-Fall-Damage.patch')
-rw-r--r--patches/server/0904-Flying-Fall-Damage.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/patches/server/0904-Flying-Fall-Damage.patch b/patches/server/0904-Flying-Fall-Damage.patch
new file mode 100644
index 0000000000..5dad37d9dc
--- /dev/null
+++ b/patches/server/0904-Flying-Fall-Damage.patch
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: TreyRuffy <[email protected]>
+Date: Fri, 27 May 2022 02:26:08 -0600
+Subject: [PATCH] Flying Fall Damage
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+index f9a308490e1cd7745dc12369c6041f0ae9e0b1e1..481c3e321cfc0f20bb1c4c6942b8bdbd23c06339 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -186,6 +186,7 @@ public abstract class Player extends LivingEntity {
+ public float hurtDir; // Paper - protected -> public
+ // Paper start
+ public boolean affectsSpawning = true;
++ public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
+ // Paper end
+
+ // CraftBukkit start
+@@ -1764,7 +1765,7 @@ public abstract class Player extends LivingEntity {
+
+ @Override
+ public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
+- if (this.abilities.mayfly) {
++ if (this.abilities.mayfly && !this.flyingFallDamage.toBooleanOrElse(false)) { // Paper - flying fall damage
+ return false;
+ } else {
+ if (fallDistance >= 2.0F) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 28963293732ff801ab0926a4b6affaec52cada54..a26f4115b3fc1964e259d73bfbca315396394ced 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -2382,6 +2382,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ this.getHandle().onUpdateAbilities();
+ }
+
++ // Paper start - flying fall damage
++ @Override
++ public void setFlyingFallDamage(@NotNull net.kyori.adventure.util.TriState flyingFallDamage) {
++ getHandle().flyingFallDamage = flyingFallDamage;
++ }
++
++ @NotNull
++ @Override
++ public net.kyori.adventure.util.TriState hasFlyingFallDamage() {
++ return getHandle().flyingFallDamage;
++ }
++ // Paper end
++
+ @Override
+ public int getNoDamageTicks() {
+ if (this.getHandle().spawnInvulnerableTime > 0) {