mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 18:31:29 +01:00
52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: TreyRuffy <TreyRuffy@users.noreply.github.com>
|
||
|
|
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 0dcae10fd05a8fe963fdedda8199aa09dc717c9a..61597ebe2f9faff43994c475074b87d11905e582 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
@@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity {
|
||
|
|
public FishingHook fishing;
|
||
|
|
// Paper start
|
||
|
|
public boolean affectsSpawning = true;
|
||
|
|
+ public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
// CraftBukkit start
|
||
|
|
@@ -1753,7 +1754,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 99bf1485ddecb5fc88850242e9c32850781c4b36..b32f44beab2c9790ee2da8403e362e8b3ecc6175 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -2167,6 +2167,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) {
|