From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: TreyRuffy Date: Wed, 9 Jun 2021 16:31:14 -0600 Subject: [PATCH] Flying Fall Damage API 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 2270ef3d2c0982dda203ae2517b6d9121135637a..8106457a149d2a28872fc81aba7bb595aa491f21 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -188,6 +188,7 @@ public abstract class Player extends LivingEntity { public boolean affectsSpawning = true; // Paper end public int sixRowEnderchestSlotCount = -1; // Purpur + public boolean flyingFallDamage = false; // Purpur // CraftBukkit start public boolean fauxSleeping; @@ -1807,7 +1808,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 && !flyingFallDamage) { // Purpur 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 d588f1b7670af21512295e446c15812cd9e2f6a2..26af7578809970e3073699db2c118872b05b512f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2999,5 +2999,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) { getHandle().spawnInvulnerableTime = spawnInvulnerableTime; } + + public void setFlyingFallDamage(boolean flyingFallDamage) { + getHandle().flyingFallDamage = flyingFallDamage; + } + + @Override + public boolean hasFlyingFallDamage() { + return getHandle().flyingFallDamage; + } // Purpur end }