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

remove pufferfish's timings warning

Browse Source
This commit is contained in:
BillyGalbreath
2022-08-05 15:30:11 -05:00
parent 4024ae6b1a
commit 2f994e7194
284 changed files with 75 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
patches/server/0188-Flying-Fall-Damage-API.patch Normal file
View File

@@ -0,0 +1,46 @@
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 e98b1512de9fa68ced782fdd8455434a213931e6..d1d8f45565b6dcdca73b2cc6fd09917b7d89e08f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2948,5 +2948,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
}