Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 4388d66e7e into 3fdd0948b7

This commit is contained in:
Teak Slack 2024-04-30 11:30:55 +03:00 committed by GitHub
parent 3fdd0948b7 4388d66e7e
commit 73ff6e1217
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
patches/server/1051-Fixes-MC-172801.patch Normal file
View File

@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Teak Slack <teakislack@gmail.com>
Date: Sun, 12 Nov 2023 14:38:52 -0500
Subject: [PATCH] Fixes MC-172801
This patch intends to fix MC-172801, an issue in which the attribute "generic.flying_speed" would not have any effect. This attribute is intended to change the flying speed of parrots and bees,
and desite being reported as far back as 1.15.2, this issue has never been fixed officially. This patch modifies the flying speed for entities only with the generic.flying_speed attribute. If they
do not have that value, parity with vanilla is perserved by setting the flying speed to 0.02F. The value is multiplied by 0.049999999254942 to perserve the vanilla 0.02 flying speed if flying_speed
is at its default value.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index a76eb3d051db0229ed088b71c92ff3f131449007..090cd219b1b1686753309ad55d0305079efea576 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2976,7 +2976,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
protected float getFlyingSpeed() {
- return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : 0.02F;
+ // Paper start - apply generic.flying_speed attribute to flying speed (fixes MC-172801)
+ float flyingSpeed = 0.02F;
+ if(this.getAttributes().hasAttribute(Attributes.FLYING_SPEED))
+ flyingSpeed = (float) (this.getAttribute(Attributes.FLYING_SPEED).getValue() * 0.049999999254942D);
+
+ return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : flyingSpeed;
+ // Paper end
}
public float getSpeed() {