Player Flying Fall Damage API (#5357)
Dieser Commit ist enthalten in:
Ursprung
52718dba10
Commit
2040c1ec71
34
patches/api/0424-Flying-Fall-Damage-API.patch
Normale Datei
34
patches/api/0424-Flying-Fall-Damage-API.patch
Normale Datei
@ -0,0 +1,34 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: TreyRuffy <TreyRuffy@users.noreply.github.com>
|
||||
Date: Fri, 27 May 2022 02:25:38 -0600
|
||||
Subject: [PATCH] Flying Fall Damage API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 9f762cf670bf5db9138e468e72e57781d8d22f54..de960716478477ce199526b8f860cfafa1541ee9 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1391,6 +1391,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
*/
|
||||
public void setAllowFlight(boolean flight);
|
||||
|
||||
+ // Paper start - flying fall damage
|
||||
+ /**
|
||||
+ * Allows you to enable fall damage while {@link #getAllowFlight()} is {@code true}
|
||||
+ *
|
||||
+ * @param flyingFallDamage Enables fall damage when {@link #getAllowFlight()} is {@code true}
|
||||
+ */
|
||||
+ public void setFlyingFallDamage(@NotNull net.kyori.adventure.util.TriState flyingFallDamage);
|
||||
+
|
||||
+ /**
|
||||
+ * Allows you to get if fall damage is enabled while {@link #getAllowFlight()} is {@code true}
|
||||
+ *
|
||||
+ * @return A tristate of whether fall damage is enabled, not set, or disabled when {@link #getAllowFlight()} is {@code true}
|
||||
+ */
|
||||
+ @NotNull
|
||||
+ public net.kyori.adventure.util.TriState hasFlyingFallDamage();
|
||||
+ // Paper end
|
||||
+
|
||||
/**
|
||||
* Hides a player from this player
|
||||
*
|
51
patches/server/0954-Flying-Fall-Damage.patch
Normale Datei
51
patches/server/0954-Flying-Fall-Damage.patch
Normale Datei
@ -0,0 +1,51 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: TreyRuffy <TreyRuffy@users.noreply.github.com>
|
||||
Date: Fri, 27 May 2022 02:26:08 -0600
|
||||
Subject: [PATCH] Flying Fall Damage
|
||||
|
||||
|
||||
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 0dcae10fd05a8fe963fdedda8199aa09dc717c9a..61597ebe2f9faff43994c475074b87d11905e582 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
@@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity {
|
||||
public FishingHook fishing;
|
||||
// Paper start
|
||||
public boolean affectsSpawning = true;
|
||||
+ public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
|
||||
// Paper end
|
||||
|
||||
// CraftBukkit start
|
||||
@@ -1753,7 +1754,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 && !this.flyingFallDamage.toBooleanOrElse(false)) { // Paper - flying fall damage
|
||||
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 99bf1485ddecb5fc88850242e9c32850781c4b36..b32f44beab2c9790ee2da8403e362e8b3ecc6175 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2167,6 +2167,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
this.getHandle().onUpdateAbilities();
|
||||
}
|
||||
|
||||
+ // Paper start - flying fall damage
|
||||
+ @Override
|
||||
+ public void setFlyingFallDamage(@NotNull net.kyori.adventure.util.TriState flyingFallDamage) {
|
||||
+ getHandle().flyingFallDamage = flyingFallDamage;
|
||||
+ }
|
||||
+
|
||||
+ @NotNull
|
||||
+ @Override
|
||||
+ public net.kyori.adventure.util.TriState hasFlyingFallDamage() {
|
||||
+ return getHandle().flyingFallDamage;
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
@Override
|
||||
public int getNoDamageTicks() {
|
||||
if (this.getHandle().spawnInvulnerableTime > 0) {
|
In neuem Issue referenzieren
Einen Benutzer sperren