2022-12-27 21:41:59 +01:00
|
|
|
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
|
2024-10-24 00:08:29 +02:00
|
|
|
index 30e0a5fe3f9bd85d2b702c2c877c5682ed35d461..aca888c2f02b09ac6739bdc81b194c4527dd69f5 100644
|
2022-12-27 21:41:59 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
2024-07-06 21:19:14 +02:00
|
|
|
@@ -196,6 +196,7 @@ public abstract class Player extends LivingEntity {
|
2024-06-14 05:41:44 +02:00
|
|
|
private boolean ignoreFallDamageFromCurrentImpulse;
|
|
|
|
|
private int currentImpulseContextResetGraceTime;
|
2024-01-24 11:45:17 +01:00
|
|
|
public boolean affectsSpawning = true; // Paper - Affects Spawning API
|
2024-01-16 12:41:40 +01:00
|
|
|
+ public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
|
2022-12-27 21:41:59 +01:00
|
|
|
|
|
|
|
|
// CraftBukkit start
|
2024-01-24 11:45:17 +01:00
|
|
|
public boolean fauxSleeping;
|
2024-10-24 00:08:29 +02:00
|
|
|
@@ -1651,7 +1652,7 @@ public abstract class Player extends LivingEntity {
|
2022-12-27 21:41:59 +01:00
|
|
|
|
|
|
|
|
@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
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
index 02850d3ef48aecda5d9b543e23d43c9b19ff3a89..68296e776cda9983d2b3f1fdabe7fcaa2e631e86 100644
|
2022-12-27 21:41:59 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2024-11-09 21:17:42 +01:00
|
|
|
@@ -2591,6 +2591,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2022-12-27 21:41:59 +01:00
|
|
|
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;
|
|
|
|
|
+ }
|
2024-01-16 12:41:40 +01:00
|
|
|
+ // Paper end - flying fall damage
|
2022-12-27 21:41:59 +01:00
|
|
|
+
|
|
|
|
|
@Override
|
|
|
|
|
public int getNoDamageTicks() {
|
|
|
|
|
if (this.getHandle().spawnInvulnerableTime > 0) {
|
