mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
d0431d6c9c
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6178609 Fix tripwire state inconsistency PaperMC/Paper@ae6fec6 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116) PaperMC/Paper@5cb2942 Update paperweight to 1.3.3 and shadow to 7.1.1 PaperMC/Paper@8a9979c Update gradle wrapper to 7.3.2 PaperMC/Paper@df8d28a Update checker framework & log4j-api for paper-api (also rebuild patches)
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 4252ff0201cbfbecc7b95ca86c1763dc5d88a4d7..535bc6d57d153a62f2cbf57747586de3d4c41b1f 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
@@ -180,6 +180,7 @@ public abstract class Player extends LivingEntity {
|
|
// Paper start
|
|
public boolean affectsSpawning = true;
|
|
// Paper end
|
|
+ public boolean flyingFallDamage = false; // Purpur
|
|
|
|
// CraftBukkit start
|
|
public boolean fauxSleeping;
|
|
@@ -1729,7 +1730,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 6691abc34043b39460eccd98311c9d8efbefa8a0..2622cf83dd501b982fdd20b31d174bb0d63d1218 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2645,5 +2645,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
|
|
}
|