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/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java index 43d8cd45a016d4eb132993e83d4c9394fc7fd20b..64f94334e6bd0517404b8614c96cbb2c5cdb67d2 100644 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java @@ -169,7 +169,10 @@ public abstract class EntityHuman extends EntityLiving { // Paper start public boolean affectsSpawning = true; // Paper end - public boolean isCritical = false; // Purpur + // Purpur start + public boolean flyingFallDamage = false; + public boolean isCritical = false; + // Purpur end // CraftBukkit start public boolean fauxSleeping; @@ -1645,7 +1648,7 @@ public abstract class EntityHuman extends EntityLiving { @Override public boolean b(float f, float f1) { - if (this.abilities.canFly) { + if (this.abilities.canFly && !flyingFallDamage) { // Purpur - allow fall damage with can fly attribute return false; } else { if (f >= 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 ecc655ae9414ceb08a92db6fce2e339ee10ea27b..cc09f3fb53112108b3d1213b443d7373cac95885 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2486,5 +2486,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setSpawnInvulnerableTicks(int invulnerableTicks) { getHandle().invulnerableTicks = invulnerableTicks; } + + @Override + public void setFlyingFallDamage(boolean flyingFallDamage) { + getHandle().flyingFallDamage = flyingFallDamage; + } + + @Override + public boolean hasFlyingFallDamage() { + return getHandle().flyingFallDamage; + } // Purpur end }