Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Component related conveniences

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-29 21:43:43 -05:00
parent 69b7ea1feb
commit 655af9a48c
219 changed files with 169 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
patches/server/0212-Flying-Fall-Damage-API.patch
View File

@@ -1,47 +0,0 @@
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 b9ce1021f12f14ba45c49890d8d529b733bae532..48e208c332a06c56fef604920a1cb95cbe743efc 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
public boolean affectsSpawning = true;
// Paper end
public boolean isCritical = false; // Purpur
+ public boolean flyingFallDamage = false; // Purpur
// CraftBukkit start
public boolean fauxSleeping;
@@ -1732,7 +1733,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 5e729ad8677b84be00895fb29a4e209248e3f55f..432ac0aa33e3d69a9fb640ec5ecc9edae42ea8ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2570,5 +2570,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}
+
+ @Override
+ public void setFlyingFallDamage(boolean flyingFallDamage) {
+ getHandle().flyingFallDamage = flyingFallDamage;
+ }
+
+ @Override
+ public boolean hasFlyingFallDamage() {
+ return getHandle().flyingFallDamage;
+ }
// Purpur end
}