mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
67f934ef19
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@d714682 Add more entity api (#7564) PaperMC/Paper@1790528 More projectile API (#5731) PaperMC/Paper@ea1efef Remove Patches (#7541)
47 lines
2.1 KiB
Diff
47 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: TreyRuffy <TreyRuffy@users.noreply.github.com>
|
|
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 99e75679acfe2c9d8583590008c14aad8d73d203..001317b9c196390dac8fe16d2aadf7e11bb97221 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
@@ -182,6 +182,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;
|
|
@@ -1742,7 +1743,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 2cf93ddb6a061fb4361f72a2df629d90f1bf27d1..ef501f2af9056ccecb861f4c916dedc08c1faafb 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2754,5 +2754,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
|
|
}
|