mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
50687db565
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b097a24 Expose isUnderWater to Entity (#8454) PaperMC/Paper@6b26cfc Add missing Entity + Projectile API (#7632) PaperMC/Paper@de2d2d4 Add PlayerInventorySlotChangeEvent (#7321) PaperMC/Paper@f7c8d79 Fix stacktrace in server tests PaperMC/Paper@b9cf1ac Fix a classloading issue in tests (#8459) PaperMC/Paper@7fe34e9 Make CraftMinecartTNT public PaperMC/Paper@514a606 Elder Guardian appearance API (#8455) PaperMC/Paper@2094011 Update settings directory path in exceptions (#7968) PaperMC/Paper@0bdf997 Avoid cycle deprecation (#8466) PaperMC/Paper@eb68bd4 Allow changing bed's 'occupied' property (#8458)
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 45dc5eeb3794492324bd316719524ea797f7ef6a..bbfb5f8f88e972a770d0ce5373c67ffe29ba0319 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
@@ -188,6 +188,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;
|
|
@@ -1798,7 +1799,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 60e586e10ba60192aaa87652629d69375ccdc85b..ae8b9dc19224c18177c3bf3490ba9470e832c85d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2995,5 +2995,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
|
|
}
|