mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-27 23:19:36 +02:00
8d040fad9b
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 465c4964 PR-843: Add damage methods to FallingBlock 46ba7c9f SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name CraftBukkit Changes: 818582f40 PR-1169: Add damage methods to FallingBlock 15a3eac66 SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name f01fb4979 SPIGOT-7336: Fix typo in internal method name
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 5b772b3caeafe98aa45a01bffe215a5dd33323b6..0629c471d38a77c44fc1c86ccdfcb0690f61ca17 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
@@ -184,6 +184,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
|
|
@@ -1754,7 +1755,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 939ef35852ee0fdad1759d3fc7f70409811d14ea..3ddd8c42ea1d2bdfc5b62d8fae6ce51b34a8e89b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2321,6 +2321,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) {
|